diff --git a/nebula3/common/ttypes.py b/nebula3/common/ttypes.py index 13e1c5c0..fc75f00f 100644 --- a/nebula3/common/ttypes.py +++ b/nebula3/common/ttypes.py @@ -143,6 +143,9 @@ class ErrorCode: E_USER_NOT_FOUND = -18 E_STATS_NOT_FOUND = -19 E_SERVICE_NOT_FOUND = -20 + E_DRAINER_NOT_FOUND = -21 + E_DRAINER_CLIENT_NOT_FOUND = -22 + E_PART_STOPPED = -23 E_BACKUP_FAILED = -24 E_BACKUP_EMPTY_TABLE = -25 E_BACKUP_TABLE_FAILED = -26 @@ -150,6 +153,12 @@ class ErrorCode: E_REBUILD_INDEX_FAILED = -28 E_INVALID_PASSWORD = -29 E_FAILED_GET_ABS_PATH = -30 + E_LISTENER_PROGRESS_FAILED = -31 + E_SYNC_LISTENER_NOT_FOUND = -32 + E_DRAINER_PROGRESS_FAILED = -33 + E_PART_DISABLED = -34 + E_PART_ALREADY_STARTED = -35 + E_PART_ALREADY_STOPPED = -36 E_BAD_USERNAME_PASSWORD = -1001 E_SESSION_INVALID = -1002 E_SESSION_TIMEOUT = -1003 @@ -172,6 +181,12 @@ class ErrorCode: E_WRONGCLUSTER = -2010 E_ZONE_NOT_ENOUGH = -2011 E_ZONE_IS_EMPTY = -2012 + E_LISTENER_CONFLICT = -2013 + E_SCHEMA_NAME_EXISTS = -2014 + E_RELATED_INDEX_EXISTS = -2015 + E_RELATED_SPACE_EXISTS = -2016 + E_RELATED_FULLTEXT_INDEX_EXISTS = -2017 + E_HISTORY_CONFLICT = -2018 E_STORE_FAILURE = -2021 E_STORE_SEGMENT_ILLEGAL = -2022 E_BAD_BALANCE_PLAN = -2023 @@ -180,13 +195,20 @@ class ErrorCode: E_NO_VALID_HOST = -2026 E_CORRUPTED_BALANCE_PLAN = -2027 E_NO_INVALID_BALANCE_PLAN = -2028 + E_NO_VALID_DRAINER = -2029 E_IMPROPER_ROLE = -2030 E_INVALID_PARTITION_NUM = -2031 E_INVALID_REPLICA_FACTOR = -2032 E_INVALID_CHARSET = -2033 E_INVALID_COLLATE = -2034 E_CHARSET_COLLATE_NOT_MATCH = -2035 + E_PRIVILEGE_ALL_TAG_EDGE_SETTLED = -2036 + E_PRIVILEGE_NOT_EXIST = -2037 + E_PRIVILEGE_NEED_BASIC_ROLE = -2038 + E_PRIVILEGE_ACTION_INVALID = -2039 E_SNAPSHOT_FAILURE = -2040 + E_SNAPSHOT_RUNNING_JOBS = -2056 + E_SNAPSHOT_NOT_FOUND = -2057 E_BLOCK_WRITE_FAILURE = -2041 E_REBUILD_INDEX_FAILURE = -2042 E_INDEX_WITH_TTL = -2043 @@ -198,8 +220,12 @@ class ErrorCode: E_TASK_REPORT_OUT_DATE = -2049 E_JOB_NOT_IN_SPACE = -2050 E_JOB_NEED_RECOVER = -2051 + E_JOB_ALREADY_FINISH = -2052 + E_JOB_SUBMITTED = -2053 + E_JOB_NOT_STOPPABLE = -2054 + E_JOB_HAS_NO_TARGET_STORAGE = -2055 E_INVALID_JOB = -2065 - E_BACKUP_BUILDING_INDEX = -2066 + E_BACKUP_RUNNING_JOBS = -2066 E_BACKUP_SPACE_NOT_FOUND = -2067 E_RESTORE_FAILURE = -2068 E_SESSION_NOT_FOUND = -2069 @@ -208,6 +234,11 @@ class ErrorCode: E_LIST_CLUSTER_NO_AGENT_FAILURE = -2072 E_QUERY_NOT_FOUND = -2073 E_AGENT_HB_FAILUE = -2074 + E_INVALID_VARIABLE = -2080 + E_VARIABLE_TYPE_VALUE_MISMATCH = -2081 + E_HOST_CAN_NOT_BE_ADDED = -2082 + E_ACCESS_ES_FAILURE = -2090 + E_GRAPH_MEMORY_EXCEEDED = -2600 E_CONSENSUS_ERROR = -3001 E_KEY_HAS_EXISTS = -3002 E_DATA_TYPE_MISMATCH = -3003 @@ -269,6 +300,23 @@ class ErrorCode: E_RAFT_BUFFER_OVERFLOW = -3529 E_RAFT_ATOMIC_OP_FAILED = -3530 E_LEADER_LEASE_FAILED = -3531 + E_RAFT_CAUGHT_UP = -3532 + E_LOG_GAP = -4001 + E_LOG_STALE = -4002 + E_INVALID_DRAINER_STORE = -4003 + E_SPACE_MISMATCH = -4004 + E_PART_MISMATCH = -4005 + E_DATA_CONFLICT = -4006 + E_REQ_CONFLICT = -4007 + E_DATA_ILLEGAL = -4008 + E_CACHE_CONFIG_ERROR = -5001 + E_NOT_ENOUGH_SPACE = -5002 + E_CACHE_MISS = -5003 + E_POOL_NOT_FOUND = -5004 + E_CACHE_WRITE_FAILURE = -5005 + E_NODE_NUMBER_EXCEED_LIMIT = -7001 + E_PARSING_LICENSE_FAILURE = -7002 + E_STORAGE_MEMORY_EXCEEDED = -3600 E_UNKNOWN = -8000 _VALUES_TO_NAMES = { @@ -293,6 +341,9 @@ class ErrorCode: -18: "E_USER_NOT_FOUND", -19: "E_STATS_NOT_FOUND", -20: "E_SERVICE_NOT_FOUND", + -21: "E_DRAINER_NOT_FOUND", + -22: "E_DRAINER_CLIENT_NOT_FOUND", + -23: "E_PART_STOPPED", -24: "E_BACKUP_FAILED", -25: "E_BACKUP_EMPTY_TABLE", -26: "E_BACKUP_TABLE_FAILED", @@ -300,6 +351,12 @@ class ErrorCode: -28: "E_REBUILD_INDEX_FAILED", -29: "E_INVALID_PASSWORD", -30: "E_FAILED_GET_ABS_PATH", + -31: "E_LISTENER_PROGRESS_FAILED", + -32: "E_SYNC_LISTENER_NOT_FOUND", + -33: "E_DRAINER_PROGRESS_FAILED", + -34: "E_PART_DISABLED", + -35: "E_PART_ALREADY_STARTED", + -36: "E_PART_ALREADY_STOPPED", -1001: "E_BAD_USERNAME_PASSWORD", -1002: "E_SESSION_INVALID", -1003: "E_SESSION_TIMEOUT", @@ -322,6 +379,12 @@ class ErrorCode: -2010: "E_WRONGCLUSTER", -2011: "E_ZONE_NOT_ENOUGH", -2012: "E_ZONE_IS_EMPTY", + -2013: "E_LISTENER_CONFLICT", + -2014: "E_SCHEMA_NAME_EXISTS", + -2015: "E_RELATED_INDEX_EXISTS", + -2016: "E_RELATED_SPACE_EXISTS", + -2017: "E_RELATED_FULLTEXT_INDEX_EXISTS", + -2018: "E_HISTORY_CONFLICT", -2021: "E_STORE_FAILURE", -2022: "E_STORE_SEGMENT_ILLEGAL", -2023: "E_BAD_BALANCE_PLAN", @@ -330,13 +393,20 @@ class ErrorCode: -2026: "E_NO_VALID_HOST", -2027: "E_CORRUPTED_BALANCE_PLAN", -2028: "E_NO_INVALID_BALANCE_PLAN", + -2029: "E_NO_VALID_DRAINER", -2030: "E_IMPROPER_ROLE", -2031: "E_INVALID_PARTITION_NUM", -2032: "E_INVALID_REPLICA_FACTOR", -2033: "E_INVALID_CHARSET", -2034: "E_INVALID_COLLATE", -2035: "E_CHARSET_COLLATE_NOT_MATCH", + -2036: "E_PRIVILEGE_ALL_TAG_EDGE_SETTLED", + -2037: "E_PRIVILEGE_NOT_EXIST", + -2038: "E_PRIVILEGE_NEED_BASIC_ROLE", + -2039: "E_PRIVILEGE_ACTION_INVALID", -2040: "E_SNAPSHOT_FAILURE", + -2056: "E_SNAPSHOT_RUNNING_JOBS", + -2057: "E_SNAPSHOT_NOT_FOUND", -2041: "E_BLOCK_WRITE_FAILURE", -2042: "E_REBUILD_INDEX_FAILURE", -2043: "E_INDEX_WITH_TTL", @@ -348,8 +418,12 @@ class ErrorCode: -2049: "E_TASK_REPORT_OUT_DATE", -2050: "E_JOB_NOT_IN_SPACE", -2051: "E_JOB_NEED_RECOVER", + -2052: "E_JOB_ALREADY_FINISH", + -2053: "E_JOB_SUBMITTED", + -2054: "E_JOB_NOT_STOPPABLE", + -2055: "E_JOB_HAS_NO_TARGET_STORAGE", -2065: "E_INVALID_JOB", - -2066: "E_BACKUP_BUILDING_INDEX", + -2066: "E_BACKUP_RUNNING_JOBS", -2067: "E_BACKUP_SPACE_NOT_FOUND", -2068: "E_RESTORE_FAILURE", -2069: "E_SESSION_NOT_FOUND", @@ -358,6 +432,11 @@ class ErrorCode: -2072: "E_LIST_CLUSTER_NO_AGENT_FAILURE", -2073: "E_QUERY_NOT_FOUND", -2074: "E_AGENT_HB_FAILUE", + -2080: "E_INVALID_VARIABLE", + -2081: "E_VARIABLE_TYPE_VALUE_MISMATCH", + -2082: "E_HOST_CAN_NOT_BE_ADDED", + -2090: "E_ACCESS_ES_FAILURE", + -2600: "E_GRAPH_MEMORY_EXCEEDED", -3001: "E_CONSENSUS_ERROR", -3002: "E_KEY_HAS_EXISTS", -3003: "E_DATA_TYPE_MISMATCH", @@ -419,6 +498,23 @@ class ErrorCode: -3529: "E_RAFT_BUFFER_OVERFLOW", -3530: "E_RAFT_ATOMIC_OP_FAILED", -3531: "E_LEADER_LEASE_FAILED", + -3532: "E_RAFT_CAUGHT_UP", + -4001: "E_LOG_GAP", + -4002: "E_LOG_STALE", + -4003: "E_INVALID_DRAINER_STORE", + -4004: "E_SPACE_MISMATCH", + -4005: "E_PART_MISMATCH", + -4006: "E_DATA_CONFLICT", + -4007: "E_REQ_CONFLICT", + -4008: "E_DATA_ILLEGAL", + -5001: "E_CACHE_CONFIG_ERROR", + -5002: "E_NOT_ENOUGH_SPACE", + -5003: "E_CACHE_MISS", + -5004: "E_POOL_NOT_FOUND", + -5005: "E_CACHE_WRITE_FAILURE", + -7001: "E_NODE_NUMBER_EXCEED_LIMIT", + -7002: "E_PARSING_LICENSE_FAILURE", + -3600: "E_STORAGE_MEMORY_EXCEEDED", -8000: "E_UNKNOWN", } @@ -444,6 +540,9 @@ class ErrorCode: "E_USER_NOT_FOUND": -18, "E_STATS_NOT_FOUND": -19, "E_SERVICE_NOT_FOUND": -20, + "E_DRAINER_NOT_FOUND": -21, + "E_DRAINER_CLIENT_NOT_FOUND": -22, + "E_PART_STOPPED": -23, "E_BACKUP_FAILED": -24, "E_BACKUP_EMPTY_TABLE": -25, "E_BACKUP_TABLE_FAILED": -26, @@ -451,6 +550,12 @@ class ErrorCode: "E_REBUILD_INDEX_FAILED": -28, "E_INVALID_PASSWORD": -29, "E_FAILED_GET_ABS_PATH": -30, + "E_LISTENER_PROGRESS_FAILED": -31, + "E_SYNC_LISTENER_NOT_FOUND": -32, + "E_DRAINER_PROGRESS_FAILED": -33, + "E_PART_DISABLED": -34, + "E_PART_ALREADY_STARTED": -35, + "E_PART_ALREADY_STOPPED": -36, "E_BAD_USERNAME_PASSWORD": -1001, "E_SESSION_INVALID": -1002, "E_SESSION_TIMEOUT": -1003, @@ -473,6 +578,12 @@ class ErrorCode: "E_WRONGCLUSTER": -2010, "E_ZONE_NOT_ENOUGH": -2011, "E_ZONE_IS_EMPTY": -2012, + "E_LISTENER_CONFLICT": -2013, + "E_SCHEMA_NAME_EXISTS": -2014, + "E_RELATED_INDEX_EXISTS": -2015, + "E_RELATED_SPACE_EXISTS": -2016, + "E_RELATED_FULLTEXT_INDEX_EXISTS": -2017, + "E_HISTORY_CONFLICT": -2018, "E_STORE_FAILURE": -2021, "E_STORE_SEGMENT_ILLEGAL": -2022, "E_BAD_BALANCE_PLAN": -2023, @@ -481,13 +592,20 @@ class ErrorCode: "E_NO_VALID_HOST": -2026, "E_CORRUPTED_BALANCE_PLAN": -2027, "E_NO_INVALID_BALANCE_PLAN": -2028, + "E_NO_VALID_DRAINER": -2029, "E_IMPROPER_ROLE": -2030, "E_INVALID_PARTITION_NUM": -2031, "E_INVALID_REPLICA_FACTOR": -2032, "E_INVALID_CHARSET": -2033, "E_INVALID_COLLATE": -2034, "E_CHARSET_COLLATE_NOT_MATCH": -2035, + "E_PRIVILEGE_ALL_TAG_EDGE_SETTLED": -2036, + "E_PRIVILEGE_NOT_EXIST": -2037, + "E_PRIVILEGE_NEED_BASIC_ROLE": -2038, + "E_PRIVILEGE_ACTION_INVALID": -2039, "E_SNAPSHOT_FAILURE": -2040, + "E_SNAPSHOT_RUNNING_JOBS": -2056, + "E_SNAPSHOT_NOT_FOUND": -2057, "E_BLOCK_WRITE_FAILURE": -2041, "E_REBUILD_INDEX_FAILURE": -2042, "E_INDEX_WITH_TTL": -2043, @@ -499,8 +617,12 @@ class ErrorCode: "E_TASK_REPORT_OUT_DATE": -2049, "E_JOB_NOT_IN_SPACE": -2050, "E_JOB_NEED_RECOVER": -2051, + "E_JOB_ALREADY_FINISH": -2052, + "E_JOB_SUBMITTED": -2053, + "E_JOB_NOT_STOPPABLE": -2054, + "E_JOB_HAS_NO_TARGET_STORAGE": -2055, "E_INVALID_JOB": -2065, - "E_BACKUP_BUILDING_INDEX": -2066, + "E_BACKUP_RUNNING_JOBS": -2066, "E_BACKUP_SPACE_NOT_FOUND": -2067, "E_RESTORE_FAILURE": -2068, "E_SESSION_NOT_FOUND": -2069, @@ -509,6 +631,11 @@ class ErrorCode: "E_LIST_CLUSTER_NO_AGENT_FAILURE": -2072, "E_QUERY_NOT_FOUND": -2073, "E_AGENT_HB_FAILUE": -2074, + "E_INVALID_VARIABLE": -2080, + "E_VARIABLE_TYPE_VALUE_MISMATCH": -2081, + "E_HOST_CAN_NOT_BE_ADDED": -2082, + "E_ACCESS_ES_FAILURE": -2090, + "E_GRAPH_MEMORY_EXCEEDED": -2600, "E_CONSENSUS_ERROR": -3001, "E_KEY_HAS_EXISTS": -3002, "E_DATA_TYPE_MISMATCH": -3003, @@ -570,6 +697,23 @@ class ErrorCode: "E_RAFT_BUFFER_OVERFLOW": -3529, "E_RAFT_ATOMIC_OP_FAILED": -3530, "E_LEADER_LEASE_FAILED": -3531, + "E_RAFT_CAUGHT_UP": -3532, + "E_LOG_GAP": -4001, + "E_LOG_STALE": -4002, + "E_INVALID_DRAINER_STORE": -4003, + "E_SPACE_MISMATCH": -4004, + "E_PART_MISMATCH": -4005, + "E_DATA_CONFLICT": -4006, + "E_REQ_CONFLICT": -4007, + "E_DATA_ILLEGAL": -4008, + "E_CACHE_CONFIG_ERROR": -5001, + "E_NOT_ENOUGH_SPACE": -5002, + "E_CACHE_MISS": -5003, + "E_POOL_NOT_FOUND": -5004, + "E_CACHE_WRITE_FAILURE": -5005, + "E_NODE_NUMBER_EXCEED_LIMIT": -7001, + "E_PARSING_LICENSE_FAILURE": -7002, + "E_STORAGE_MEMORY_EXCEEDED": -3600, "E_UNKNOWN": -8000, } @@ -3433,6 +3577,8 @@ class LogInfo: Attributes: - log_id - term_id + - commit_log_id + - checkpoint_path """ thrift_spec = None @@ -3465,6 +3611,16 @@ def read(self, iprot): self.term_id = iprot.readI64() else: iprot.skip(ftype) + elif fid == 3: + if ftype == TType.I64: + self.commit_log_id = iprot.readI64() + else: + iprot.skip(ftype) + elif fid == 4: + if ftype == TType.STRING: + self.checkpoint_path = iprot.readString() + else: + iprot.skip(ftype) else: iprot.skip(ftype) iprot.readFieldEnd() @@ -3486,6 +3642,14 @@ def write(self, oprot): oprot.writeFieldBegin('term_id', TType.I64, 2) oprot.writeI64(self.term_id) oprot.writeFieldEnd() + if self.commit_log_id != None: + oprot.writeFieldBegin('commit_log_id', TType.I64, 3) + oprot.writeI64(self.commit_log_id) + oprot.writeFieldEnd() + if self.checkpoint_path != None: + oprot.writeFieldBegin('checkpoint_path', TType.STRING, 4) + oprot.writeString(self.checkpoint_path) + oprot.writeFieldEnd() oprot.writeFieldStop() oprot.writeStructEnd() @@ -3500,6 +3664,14 @@ def __repr__(self): value = pprint.pformat(self.term_id, indent=0) value = padding.join(value.splitlines(True)) L.append(' term_id=%s' % (value)) + if self.commit_log_id is not None: + value = pprint.pformat(self.commit_log_id, indent=0) + value = padding.join(value.splitlines(True)) + L.append(' commit_log_id=%s' % (value)) + if self.checkpoint_path is not None: + value = pprint.pformat(self.checkpoint_path, indent=0) + value = padding.join(value.splitlines(True)) + L.append(' checkpoint_path=%s' % (value)) return "%s(%s)" % (self.__class__.__name__, "\n" + ",\n".join(L) if L else '') def __eq__(self, other): @@ -3618,7 +3790,7 @@ class CheckpointInfo: Attributes: - space_id - parts - - path + - data_path """ thrift_spec = None @@ -3667,7 +3839,7 @@ def read(self, iprot): iprot.skip(ftype) elif fid == 3: if ftype == TType.STRING: - self.path = iprot.readString() + self.data_path = iprot.readString() else: iprot.skip(ftype) else: @@ -3695,9 +3867,9 @@ def write(self, oprot): viter149.write(oprot) oprot.writeMapEnd() oprot.writeFieldEnd() - if self.path != None: - oprot.writeFieldBegin('path', TType.STRING, 3) - oprot.writeString(self.path) + if self.data_path != None: + oprot.writeFieldBegin('data_path', TType.STRING, 3) + oprot.writeString(self.data_path) oprot.writeFieldEnd() oprot.writeFieldStop() oprot.writeStructEnd() @@ -3713,10 +3885,10 @@ def __repr__(self): value = pprint.pformat(self.parts, indent=0) value = padding.join(value.splitlines(True)) L.append(' parts=%s' % (value)) - if self.path is not None: - value = pprint.pformat(self.path, indent=0) + if self.data_path is not None: + value = pprint.pformat(self.data_path, indent=0) value = padding.join(value.splitlines(True)) - L.append(' path=%s' % (value)) + L.append(' data_path=%s' % (value)) return "%s(%s)" % (self.__class__.__name__, "\n" + ",\n".join(L) if L else '') def __eq__(self, other): @@ -4598,6 +4770,8 @@ def Duration__setstate__(self, state): None, # 0 (1, TType.I64, 'log_id', None, None, 2, ), # 1 (2, TType.I64, 'term_id', None, None, 2, ), # 2 + (3, TType.I64, 'commit_log_id', None, None, 2, ), # 3 + (4, TType.STRING, 'checkpoint_path', False, None, 2, ), # 4 ) LogInfo.thrift_struct_annotations = { @@ -4605,15 +4779,19 @@ def Duration__setstate__(self, state): LogInfo.thrift_field_annotations = { } -def LogInfo__init__(self, log_id=None, term_id=None,): +def LogInfo__init__(self, log_id=None, term_id=None, commit_log_id=None, checkpoint_path=None,): self.log_id = log_id self.term_id = term_id + self.commit_log_id = commit_log_id + self.checkpoint_path = checkpoint_path LogInfo.__init__ = LogInfo__init__ def LogInfo__setstate__(self, state): state.setdefault('log_id', None) state.setdefault('term_id', None) + state.setdefault('commit_log_id', None) + state.setdefault('checkpoint_path', None) self.__dict__ = state LogInfo.__getstate__ = lambda self: self.__dict__.copy() @@ -4650,7 +4828,7 @@ def DirInfo__setstate__(self, state): None, # 0 (1, TType.I32, 'space_id', None, None, 2, ), # 1 (2, TType.MAP, 'parts', (TType.I32,None,TType.STRUCT,[LogInfo, LogInfo.thrift_spec, False]), None, 2, ), # 2 - (3, TType.STRING, 'path', False, None, 2, ), # 3 + (3, TType.STRING, 'data_path', False, None, 2, ), # 3 ) CheckpointInfo.thrift_struct_annotations = { @@ -4658,17 +4836,17 @@ def DirInfo__setstate__(self, state): CheckpointInfo.thrift_field_annotations = { } -def CheckpointInfo__init__(self, space_id=None, parts=None, path=None,): +def CheckpointInfo__init__(self, space_id=None, parts=None, data_path=None,): self.space_id = space_id self.parts = parts - self.path = path + self.data_path = data_path CheckpointInfo.__init__ = CheckpointInfo__init__ def CheckpointInfo__setstate__(self, state): state.setdefault('space_id', None) state.setdefault('parts', None) - state.setdefault('path', None) + state.setdefault('data_path', None) self.__dict__ = state CheckpointInfo.__getstate__ = lambda self: self.__dict__.copy() diff --git a/nebula3/graph/GraphService-fuzzer b/nebula3/graph/GraphService-fuzzer old mode 100755 new mode 100644 diff --git a/nebula3/graph/GraphService-remote b/nebula3/graph/GraphService-remote old mode 100755 new mode 100644 diff --git a/nebula3/meta/MetaService-fuzzer b/nebula3/meta/MetaService-fuzzer old mode 100755 new mode 100644 diff --git a/nebula3/meta/MetaService-remote b/nebula3/meta/MetaService-remote old mode 100755 new mode 100644 index f8739160..5f48bd78 --- a/nebula3/meta/MetaService-remote +++ b/nebula3/meta/MetaService-remote @@ -117,11 +117,11 @@ FUNCTIONS = { 'updateSessions': Function('updateSessions', 'MetaService', 'UpdateSessionsResp', [('UpdateSessionsReq', 'req', 'UpdateSessionsReq')]), 'listSessions': Function('listSessions', 'MetaService', 'ListSessionsResp', [('ListSessionsReq', 'req', 'ListSessionsReq')]), 'getSession': Function('getSession', 'MetaService', 'GetSessionResp', [('GetSessionReq', 'req', 'GetSessionReq')]), - 'removeSession': Function('removeSession', 'MetaService', 'ExecResp', [('RemoveSessionReq', 'req', 'RemoveSessionReq')]), + 'removeSession': Function('removeSession', 'MetaService', 'RemoveSessionResp', [('RemoveSessionReq', 'req', 'RemoveSessionReq')]), 'killQuery': Function('killQuery', 'MetaService', 'ExecResp', [('KillQueryReq', 'req', 'KillQueryReq')]), 'reportTaskFinish': Function('reportTaskFinish', 'MetaService', 'ExecResp', [('ReportTaskReq', 'req', 'ReportTaskReq')]), 'createBackup': Function('createBackup', 'MetaService', 'CreateBackupResp', [('CreateBackupReq', 'req', 'CreateBackupReq')]), - 'restoreMeta': Function('restoreMeta', 'MetaService', 'ExecResp', [('RestoreMetaReq', 'req', 'RestoreMetaReq')]), + 'restoreMeta': Function('restoreMeta', 'MetaService', 'RestoreMetaResp', [('RestoreMetaReq', 'req', 'RestoreMetaReq')]), 'listCluster': Function('listCluster', 'MetaService', 'ListClusterInfoResp', [('ListClusterInfoReq', 'req', 'ListClusterInfoReq')]), 'getMetaDirInfo': Function('getMetaDirInfo', 'MetaService', 'GetMetaDirInfoResp', [('GetMetaDirInfoReq', 'req', 'GetMetaDirInfoReq')]), 'verifyClientVersion': Function('verifyClientVersion', 'MetaService', 'VerifyClientVersionResp', [('VerifyClientVersionReq', 'req', 'VerifyClientVersionReq')]), diff --git a/nebula3/meta/MetaService.py b/nebula3/meta/MetaService.py index b4c2443c..40d56c80 100644 --- a/nebula3/meta/MetaService.py +++ b/nebula3/meta/MetaService.py @@ -12,7 +12,7 @@ from nebula3.fbthrift.protocol.TProtocol import TProtocolException -from .ttypes import UTF8STRINGS, AlterSchemaOp, RoleType, GeoShape, IsolationLevel, HostStatus, SnapshotStatus, AlterSpaceOp, JobOp, JobType, JobStatus, ListHostType, HostRole, TaskResult, ConfigModule, ConfigMode, ListenerType, ExternalServiceType, QueryStatus, ID, ColumnTypeDef, ColumnDef, SchemaProp, Schema, IdName, SpaceDesc, SpaceItem, TagItem, AlterSchemaItem, EdgeItem, IndexParams, IndexItem, HostItem, UserItem, RoleItem, ExecResp, AlterSpaceReq, AdminJobReq, JobDesc, TaskDesc, AdminJobResult, AdminJobResp, Correlativity, StatsItem, CreateSpaceReq, CreateSpaceAsReq, DropSpaceReq, ClearSpaceReq, ListSpacesReq, ListSpacesResp, GetSpaceReq, GetSpaceResp, CreateTagReq, AlterTagReq, DropTagReq, ListTagsReq, ListTagsResp, GetTagReq, GetTagResp, CreateEdgeReq, AlterEdgeReq, GetEdgeReq, GetEdgeResp, DropEdgeReq, ListEdgesReq, ListEdgesResp, AddHostsReq, DropHostsReq, ListHostsReq, ListHostsResp, PartItem, ListPartsReq, ListPartsResp, GetPartsAllocReq, GetPartsAllocResp, GetWorkerIdReq, GetWorkerIdResp, GetSegmentIdReq, GetSegmentIdResp, HBResp, LeaderInfo, PartitionList, HBReq, ServiceInfo, AgentHBReq, AgentHBResp, IndexFieldDef, CreateTagIndexReq, DropTagIndexReq, GetTagIndexReq, GetTagIndexResp, ListTagIndexesReq, ListTagIndexesResp, CreateEdgeIndexReq, DropEdgeIndexReq, GetEdgeIndexReq, GetEdgeIndexResp, ListEdgeIndexesReq, ListEdgeIndexesResp, RebuildIndexReq, CreateUserReq, DropUserReq, AlterUserReq, GrantRoleReq, RevokeRoleReq, ListUsersReq, ListUsersResp, ListRolesReq, ListRolesResp, GetUserRolesReq, ChangePasswordReq, BalanceTask, ConfigItem, RegConfigReq, GetConfigReq, GetConfigResp, SetConfigReq, ListConfigsReq, ListConfigsResp, CreateSnapshotReq, DropSnapshotReq, ListSnapshotsReq, Snapshot, ListSnapshotsResp, ListIndexStatusReq, IndexStatus, ListIndexStatusResp, MergeZoneReq, DropZoneReq, DivideZoneReq, RenameZoneReq, AddHostsIntoZoneReq, GetZoneReq, GetZoneResp, ListZonesReq, Zone, ListZonesResp, AddListenerReq, RemoveListenerReq, ListListenerReq, ListenerInfo, ListListenerResp, GetStatsReq, GetStatsResp, HostBackupInfo, SpaceBackupInfo, BackupMeta, CreateBackupReq, CreateBackupResp, HostPair, RestoreMetaReq, ServiceClient, SignInServiceReq, SignOutServiceReq, ListServiceClientsReq, ListServiceClientsResp, FTIndex, CreateFTIndexReq, DropFTIndexReq, ListFTIndexesReq, ListFTIndexesResp, QueryDesc, Session, CreateSessionReq, CreateSessionResp, UpdateSessionsReq, UpdateSessionsResp, ListSessionsReq, ListSessionsResp, GetSessionReq, GetSessionResp, RemoveSessionReq, KillQueryReq, ReportTaskReq, ListClusterInfoResp, ListClusterInfoReq, GetMetaDirInfoResp, GetMetaDirInfoReq, VerifyClientVersionResp, VerifyClientVersionReq, SaveGraphVersionResp, SaveGraphVersionReq, SchemaVer, ClusterID +from .ttypes import UTF8STRINGS, AlterSchemaOp, RoleType, GeoShape, IsolationLevel, HostStatus, SnapshotStatus, AlterSpaceOp, JobOp, JobType, JobStatus, ListHostType, HostRole, TaskResult, ConfigModule, ConfigMode, ListenerType, ExternalServiceType, QueryStatus, ID, ColumnTypeDef, ColumnDef, SchemaProp, Schema, IdName, SpaceDesc, SpaceItem, TagItem, AlterSchemaItem, EdgeItem, IndexParams, IndexItem, HostItem, UserItem, RoleItem, ExecResp, AlterSpaceReq, AdminJobReq, JobDesc, TaskDesc, AdminJobResult, AdminJobResp, Correlativity, StatsItem, CreateSpaceReq, CreateSpaceAsReq, DropSpaceReq, ClearSpaceReq, ListSpacesReq, ListSpacesResp, GetSpaceReq, GetSpaceResp, CreateTagReq, AlterTagReq, DropTagReq, ListTagsReq, ListTagsResp, GetTagReq, GetTagResp, CreateEdgeReq, AlterEdgeReq, GetEdgeReq, GetEdgeResp, DropEdgeReq, ListEdgesReq, ListEdgesResp, AddHostsReq, DropHostsReq, ListHostsReq, ListHostsResp, PartItem, ListPartsReq, ListPartsResp, GetPartsAllocReq, GetPartsAllocResp, GetWorkerIdReq, GetWorkerIdResp, GetSegmentIdReq, GetSegmentIdResp, HBResp, LeaderInfo, PartitionList, HBReq, ServiceInfo, AgentHBReq, AgentHBResp, IndexFieldDef, CreateTagIndexReq, DropTagIndexReq, GetTagIndexReq, GetTagIndexResp, ListTagIndexesReq, ListTagIndexesResp, CreateEdgeIndexReq, DropEdgeIndexReq, GetEdgeIndexReq, GetEdgeIndexResp, ListEdgeIndexesReq, ListEdgeIndexesResp, RebuildIndexReq, CreateUserReq, DropUserReq, AlterUserReq, GrantRoleReq, RevokeRoleReq, ListUsersReq, ListUsersResp, ListRolesReq, ListRolesResp, GetUserRolesReq, ChangePasswordReq, BalanceTask, ConfigItem, RegConfigReq, GetConfigReq, GetConfigResp, SetConfigReq, ListConfigsReq, ListConfigsResp, CreateSnapshotReq, DropSnapshotReq, ListSnapshotsReq, Snapshot, ListSnapshotsResp, ListIndexStatusReq, IndexStatus, ListIndexStatusResp, MergeZoneReq, DropZoneReq, DivideZoneReq, RenameZoneReq, AddHostsIntoZoneReq, GetZoneReq, GetZoneResp, ListZonesReq, Zone, ListZonesResp, AddListenerReq, RemoveListenerReq, ListListenerReq, ListenerInfo, ListListenerResp, GetStatsReq, GetStatsResp, HostBackupInfo, SpaceBackupInfo, BackupMeta, CreateBackupReq, CreateBackupResp, HostPair, RestoreMetaReq, PartInfo, RestoreMetaResp, ServiceClient, SignInServiceReq, SignOutServiceReq, ListServiceClientsReq, ListServiceClientsResp, FTIndex, CreateFTIndexReq, DropFTIndexReq, ListFTIndexesReq, ListFTIndexesResp, QueryDesc, Session, CreateSessionReq, CreateSessionResp, UpdateSessionsReq, UpdateSessionsResp, ListSessionsReq, ListSessionsResp, GetSessionReq, GetSessionResp, RemoveSessionReq, RemoveSessionResp, KillQueryReq, ReportTaskReq, ListClusterInfoResp, ListClusterInfoReq, GetMetaDirInfoResp, GetMetaDirInfoReq, VerifyClientVersionResp, VerifyClientVersionReq, SaveGraphVersionResp, SaveGraphVersionReq, SchemaVer, ClusterID import nebula3.common.ttypes from nebula3.fbthrift.Thrift import TProcessor @@ -15686,7 +15686,7 @@ def read(self, iprot): break if fid == 0: if ftype == TType.STRUCT: - self.success = ExecResp() + self.success = RemoveSessionResp() self.success.read(iprot) else: iprot.skip(ftype) @@ -15733,7 +15733,7 @@ def __ne__(self, other): all_structs.append(removeSession_result) removeSession_result.thrift_spec = ( - (0, TType.STRUCT, 'success', [ExecResp, ExecResp.thrift_spec, False], None, 2, ), # 0 + (0, TType.STRUCT, 'success', [RemoveSessionResp, RemoveSessionResp.thrift_spec, False], None, 2, ), # 0 ) removeSession_result.thrift_struct_annotations = { @@ -16450,7 +16450,7 @@ def read(self, iprot): break if fid == 0: if ftype == TType.STRUCT: - self.success = ExecResp() + self.success = RestoreMetaResp() self.success.read(iprot) else: iprot.skip(ftype) @@ -16497,7 +16497,7 @@ def __ne__(self, other): all_structs.append(restoreMeta_result) restoreMeta_result.thrift_spec = ( - (0, TType.STRUCT, 'success', [ExecResp, ExecResp.thrift_spec, False], None, 2, ), # 0 + (0, TType.STRUCT, 'success', [RestoreMetaResp, RestoreMetaResp.thrift_spec, False], None, 2, ), # 0 ) restoreMeta_result.thrift_struct_annotations = { diff --git a/nebula3/meta/constants.py b/nebula3/meta/constants.py index 25f575ca..1651eebd 100644 --- a/nebula3/meta/constants.py +++ b/nebula3/meta/constants.py @@ -15,5 +15,5 @@ import nebula3.common.ttypes -from .ttypes import UTF8STRINGS, AlterSchemaOp, RoleType, GeoShape, IsolationLevel, HostStatus, SnapshotStatus, AlterSpaceOp, JobOp, JobType, JobStatus, ListHostType, HostRole, TaskResult, ConfigModule, ConfigMode, ListenerType, ExternalServiceType, QueryStatus, ID, ColumnTypeDef, ColumnDef, SchemaProp, Schema, IdName, SpaceDesc, SpaceItem, TagItem, AlterSchemaItem, EdgeItem, IndexParams, IndexItem, HostItem, UserItem, RoleItem, ExecResp, AlterSpaceReq, AdminJobReq, JobDesc, TaskDesc, AdminJobResult, AdminJobResp, Correlativity, StatsItem, CreateSpaceReq, CreateSpaceAsReq, DropSpaceReq, ClearSpaceReq, ListSpacesReq, ListSpacesResp, GetSpaceReq, GetSpaceResp, CreateTagReq, AlterTagReq, DropTagReq, ListTagsReq, ListTagsResp, GetTagReq, GetTagResp, CreateEdgeReq, AlterEdgeReq, GetEdgeReq, GetEdgeResp, DropEdgeReq, ListEdgesReq, ListEdgesResp, AddHostsReq, DropHostsReq, ListHostsReq, ListHostsResp, PartItem, ListPartsReq, ListPartsResp, GetPartsAllocReq, GetPartsAllocResp, GetWorkerIdReq, GetWorkerIdResp, GetSegmentIdReq, GetSegmentIdResp, HBResp, LeaderInfo, PartitionList, HBReq, ServiceInfo, AgentHBReq, AgentHBResp, IndexFieldDef, CreateTagIndexReq, DropTagIndexReq, GetTagIndexReq, GetTagIndexResp, ListTagIndexesReq, ListTagIndexesResp, CreateEdgeIndexReq, DropEdgeIndexReq, GetEdgeIndexReq, GetEdgeIndexResp, ListEdgeIndexesReq, ListEdgeIndexesResp, RebuildIndexReq, CreateUserReq, DropUserReq, AlterUserReq, GrantRoleReq, RevokeRoleReq, ListUsersReq, ListUsersResp, ListRolesReq, ListRolesResp, GetUserRolesReq, ChangePasswordReq, BalanceTask, ConfigItem, RegConfigReq, GetConfigReq, GetConfigResp, SetConfigReq, ListConfigsReq, ListConfigsResp, CreateSnapshotReq, DropSnapshotReq, ListSnapshotsReq, Snapshot, ListSnapshotsResp, ListIndexStatusReq, IndexStatus, ListIndexStatusResp, MergeZoneReq, DropZoneReq, DivideZoneReq, RenameZoneReq, AddHostsIntoZoneReq, GetZoneReq, GetZoneResp, ListZonesReq, Zone, ListZonesResp, AddListenerReq, RemoveListenerReq, ListListenerReq, ListenerInfo, ListListenerResp, GetStatsReq, GetStatsResp, HostBackupInfo, SpaceBackupInfo, BackupMeta, CreateBackupReq, CreateBackupResp, HostPair, RestoreMetaReq, ServiceClient, SignInServiceReq, SignOutServiceReq, ListServiceClientsReq, ListServiceClientsResp, FTIndex, CreateFTIndexReq, DropFTIndexReq, ListFTIndexesReq, ListFTIndexesResp, QueryDesc, Session, CreateSessionReq, CreateSessionResp, UpdateSessionsReq, UpdateSessionsResp, ListSessionsReq, ListSessionsResp, GetSessionReq, GetSessionResp, RemoveSessionReq, KillQueryReq, ReportTaskReq, ListClusterInfoResp, ListClusterInfoReq, GetMetaDirInfoResp, GetMetaDirInfoReq, VerifyClientVersionResp, VerifyClientVersionReq, SaveGraphVersionResp, SaveGraphVersionReq, SchemaVer, ClusterID +from .ttypes import UTF8STRINGS, AlterSchemaOp, RoleType, GeoShape, IsolationLevel, HostStatus, SnapshotStatus, AlterSpaceOp, JobOp, JobType, JobStatus, ListHostType, HostRole, TaskResult, ConfigModule, ConfigMode, ListenerType, ExternalServiceType, QueryStatus, ID, ColumnTypeDef, ColumnDef, SchemaProp, Schema, IdName, SpaceDesc, SpaceItem, TagItem, AlterSchemaItem, EdgeItem, IndexParams, IndexItem, HostItem, UserItem, RoleItem, ExecResp, AlterSpaceReq, AdminJobReq, JobDesc, TaskDesc, AdminJobResult, AdminJobResp, Correlativity, StatsItem, CreateSpaceReq, CreateSpaceAsReq, DropSpaceReq, ClearSpaceReq, ListSpacesReq, ListSpacesResp, GetSpaceReq, GetSpaceResp, CreateTagReq, AlterTagReq, DropTagReq, ListTagsReq, ListTagsResp, GetTagReq, GetTagResp, CreateEdgeReq, AlterEdgeReq, GetEdgeReq, GetEdgeResp, DropEdgeReq, ListEdgesReq, ListEdgesResp, AddHostsReq, DropHostsReq, ListHostsReq, ListHostsResp, PartItem, ListPartsReq, ListPartsResp, GetPartsAllocReq, GetPartsAllocResp, GetWorkerIdReq, GetWorkerIdResp, GetSegmentIdReq, GetSegmentIdResp, HBResp, LeaderInfo, PartitionList, HBReq, ServiceInfo, AgentHBReq, AgentHBResp, IndexFieldDef, CreateTagIndexReq, DropTagIndexReq, GetTagIndexReq, GetTagIndexResp, ListTagIndexesReq, ListTagIndexesResp, CreateEdgeIndexReq, DropEdgeIndexReq, GetEdgeIndexReq, GetEdgeIndexResp, ListEdgeIndexesReq, ListEdgeIndexesResp, RebuildIndexReq, CreateUserReq, DropUserReq, AlterUserReq, GrantRoleReq, RevokeRoleReq, ListUsersReq, ListUsersResp, ListRolesReq, ListRolesResp, GetUserRolesReq, ChangePasswordReq, BalanceTask, ConfigItem, RegConfigReq, GetConfigReq, GetConfigResp, SetConfigReq, ListConfigsReq, ListConfigsResp, CreateSnapshotReq, DropSnapshotReq, ListSnapshotsReq, Snapshot, ListSnapshotsResp, ListIndexStatusReq, IndexStatus, ListIndexStatusResp, MergeZoneReq, DropZoneReq, DivideZoneReq, RenameZoneReq, AddHostsIntoZoneReq, GetZoneReq, GetZoneResp, ListZonesReq, Zone, ListZonesResp, AddListenerReq, RemoveListenerReq, ListListenerReq, ListenerInfo, ListListenerResp, GetStatsReq, GetStatsResp, HostBackupInfo, SpaceBackupInfo, BackupMeta, CreateBackupReq, CreateBackupResp, HostPair, RestoreMetaReq, PartInfo, RestoreMetaResp, ServiceClient, SignInServiceReq, SignOutServiceReq, ListServiceClientsReq, ListServiceClientsResp, FTIndex, CreateFTIndexReq, DropFTIndexReq, ListFTIndexesReq, ListFTIndexesResp, QueryDesc, Session, CreateSessionReq, CreateSessionResp, UpdateSessionsReq, UpdateSessionsResp, ListSessionsReq, ListSessionsResp, GetSessionReq, GetSessionResp, RemoveSessionReq, RemoveSessionResp, KillQueryReq, ReportTaskReq, ListClusterInfoResp, ListClusterInfoReq, GetMetaDirInfoResp, GetMetaDirInfoReq, VerifyClientVersionResp, VerifyClientVersionReq, SaveGraphVersionResp, SaveGraphVersionReq, SchemaVer, ClusterID diff --git a/nebula3/meta/ttypes.py b/nebula3/meta/ttypes.py index 525721ed..07e842e1 100644 --- a/nebula3/meta/ttypes.py +++ b/nebula3/meta/ttypes.py @@ -30,7 +30,7 @@ all_structs = [] UTF8STRINGS = bool(0) or sys.version_info.major >= 3 -__all__ = ['UTF8STRINGS', 'AlterSchemaOp', 'RoleType', 'GeoShape', 'IsolationLevel', 'HostStatus', 'SnapshotStatus', 'AlterSpaceOp', 'JobOp', 'JobType', 'JobStatus', 'ListHostType', 'HostRole', 'TaskResult', 'ConfigModule', 'ConfigMode', 'ListenerType', 'ExternalServiceType', 'QueryStatus', 'ID', 'ColumnTypeDef', 'ColumnDef', 'SchemaProp', 'Schema', 'IdName', 'SpaceDesc', 'SpaceItem', 'TagItem', 'AlterSchemaItem', 'EdgeItem', 'IndexParams', 'IndexItem', 'HostItem', 'UserItem', 'RoleItem', 'ExecResp', 'AlterSpaceReq', 'AdminJobReq', 'JobDesc', 'TaskDesc', 'AdminJobResult', 'AdminJobResp', 'Correlativity', 'StatsItem', 'CreateSpaceReq', 'CreateSpaceAsReq', 'DropSpaceReq', 'ClearSpaceReq', 'ListSpacesReq', 'ListSpacesResp', 'GetSpaceReq', 'GetSpaceResp', 'CreateTagReq', 'AlterTagReq', 'DropTagReq', 'ListTagsReq', 'ListTagsResp', 'GetTagReq', 'GetTagResp', 'CreateEdgeReq', 'AlterEdgeReq', 'GetEdgeReq', 'GetEdgeResp', 'DropEdgeReq', 'ListEdgesReq', 'ListEdgesResp', 'AddHostsReq', 'DropHostsReq', 'ListHostsReq', 'ListHostsResp', 'PartItem', 'ListPartsReq', 'ListPartsResp', 'GetPartsAllocReq', 'GetPartsAllocResp', 'GetWorkerIdReq', 'GetWorkerIdResp', 'GetSegmentIdReq', 'GetSegmentIdResp', 'HBResp', 'LeaderInfo', 'PartitionList', 'HBReq', 'ServiceInfo', 'AgentHBReq', 'AgentHBResp', 'IndexFieldDef', 'CreateTagIndexReq', 'DropTagIndexReq', 'GetTagIndexReq', 'GetTagIndexResp', 'ListTagIndexesReq', 'ListTagIndexesResp', 'CreateEdgeIndexReq', 'DropEdgeIndexReq', 'GetEdgeIndexReq', 'GetEdgeIndexResp', 'ListEdgeIndexesReq', 'ListEdgeIndexesResp', 'RebuildIndexReq', 'CreateUserReq', 'DropUserReq', 'AlterUserReq', 'GrantRoleReq', 'RevokeRoleReq', 'ListUsersReq', 'ListUsersResp', 'ListRolesReq', 'ListRolesResp', 'GetUserRolesReq', 'ChangePasswordReq', 'BalanceTask', 'ConfigItem', 'RegConfigReq', 'GetConfigReq', 'GetConfigResp', 'SetConfigReq', 'ListConfigsReq', 'ListConfigsResp', 'CreateSnapshotReq', 'DropSnapshotReq', 'ListSnapshotsReq', 'Snapshot', 'ListSnapshotsResp', 'ListIndexStatusReq', 'IndexStatus', 'ListIndexStatusResp', 'MergeZoneReq', 'DropZoneReq', 'DivideZoneReq', 'RenameZoneReq', 'AddHostsIntoZoneReq', 'GetZoneReq', 'GetZoneResp', 'ListZonesReq', 'Zone', 'ListZonesResp', 'AddListenerReq', 'RemoveListenerReq', 'ListListenerReq', 'ListenerInfo', 'ListListenerResp', 'GetStatsReq', 'GetStatsResp', 'HostBackupInfo', 'SpaceBackupInfo', 'BackupMeta', 'CreateBackupReq', 'CreateBackupResp', 'HostPair', 'RestoreMetaReq', 'ServiceClient', 'SignInServiceReq', 'SignOutServiceReq', 'ListServiceClientsReq', 'ListServiceClientsResp', 'FTIndex', 'CreateFTIndexReq', 'DropFTIndexReq', 'ListFTIndexesReq', 'ListFTIndexesResp', 'QueryDesc', 'Session', 'CreateSessionReq', 'CreateSessionResp', 'UpdateSessionsReq', 'UpdateSessionsResp', 'ListSessionsReq', 'ListSessionsResp', 'GetSessionReq', 'GetSessionResp', 'RemoveSessionReq', 'KillQueryReq', 'ReportTaskReq', 'ListClusterInfoResp', 'ListClusterInfoReq', 'GetMetaDirInfoResp', 'GetMetaDirInfoReq', 'VerifyClientVersionResp', 'VerifyClientVersionReq', 'SaveGraphVersionResp', 'SaveGraphVersionReq', 'SchemaVer', 'ClusterID'] +__all__ = ['UTF8STRINGS', 'AlterSchemaOp', 'RoleType', 'GeoShape', 'IsolationLevel', 'HostStatus', 'SnapshotStatus', 'AlterSpaceOp', 'JobOp', 'JobType', 'JobStatus', 'ListHostType', 'HostRole', 'TaskResult', 'ConfigModule', 'ConfigMode', 'ListenerType', 'ExternalServiceType', 'QueryStatus', 'ID', 'ColumnTypeDef', 'ColumnDef', 'SchemaProp', 'Schema', 'IdName', 'SpaceDesc', 'SpaceItem', 'TagItem', 'AlterSchemaItem', 'EdgeItem', 'IndexParams', 'IndexItem', 'HostItem', 'UserItem', 'RoleItem', 'ExecResp', 'AlterSpaceReq', 'AdminJobReq', 'JobDesc', 'TaskDesc', 'AdminJobResult', 'AdminJobResp', 'Correlativity', 'StatsItem', 'CreateSpaceReq', 'CreateSpaceAsReq', 'DropSpaceReq', 'ClearSpaceReq', 'ListSpacesReq', 'ListSpacesResp', 'GetSpaceReq', 'GetSpaceResp', 'CreateTagReq', 'AlterTagReq', 'DropTagReq', 'ListTagsReq', 'ListTagsResp', 'GetTagReq', 'GetTagResp', 'CreateEdgeReq', 'AlterEdgeReq', 'GetEdgeReq', 'GetEdgeResp', 'DropEdgeReq', 'ListEdgesReq', 'ListEdgesResp', 'AddHostsReq', 'DropHostsReq', 'ListHostsReq', 'ListHostsResp', 'PartItem', 'ListPartsReq', 'ListPartsResp', 'GetPartsAllocReq', 'GetPartsAllocResp', 'GetWorkerIdReq', 'GetWorkerIdResp', 'GetSegmentIdReq', 'GetSegmentIdResp', 'HBResp', 'LeaderInfo', 'PartitionList', 'HBReq', 'ServiceInfo', 'AgentHBReq', 'AgentHBResp', 'IndexFieldDef', 'CreateTagIndexReq', 'DropTagIndexReq', 'GetTagIndexReq', 'GetTagIndexResp', 'ListTagIndexesReq', 'ListTagIndexesResp', 'CreateEdgeIndexReq', 'DropEdgeIndexReq', 'GetEdgeIndexReq', 'GetEdgeIndexResp', 'ListEdgeIndexesReq', 'ListEdgeIndexesResp', 'RebuildIndexReq', 'CreateUserReq', 'DropUserReq', 'AlterUserReq', 'GrantRoleReq', 'RevokeRoleReq', 'ListUsersReq', 'ListUsersResp', 'ListRolesReq', 'ListRolesResp', 'GetUserRolesReq', 'ChangePasswordReq', 'BalanceTask', 'ConfigItem', 'RegConfigReq', 'GetConfigReq', 'GetConfigResp', 'SetConfigReq', 'ListConfigsReq', 'ListConfigsResp', 'CreateSnapshotReq', 'DropSnapshotReq', 'ListSnapshotsReq', 'Snapshot', 'ListSnapshotsResp', 'ListIndexStatusReq', 'IndexStatus', 'ListIndexStatusResp', 'MergeZoneReq', 'DropZoneReq', 'DivideZoneReq', 'RenameZoneReq', 'AddHostsIntoZoneReq', 'GetZoneReq', 'GetZoneResp', 'ListZonesReq', 'Zone', 'ListZonesResp', 'AddListenerReq', 'RemoveListenerReq', 'ListListenerReq', 'ListenerInfo', 'ListListenerResp', 'GetStatsReq', 'GetStatsResp', 'HostBackupInfo', 'SpaceBackupInfo', 'BackupMeta', 'CreateBackupReq', 'CreateBackupResp', 'HostPair', 'RestoreMetaReq', 'PartInfo', 'RestoreMetaResp', 'ServiceClient', 'SignInServiceReq', 'SignOutServiceReq', 'ListServiceClientsReq', 'ListServiceClientsResp', 'FTIndex', 'CreateFTIndexReq', 'DropFTIndexReq', 'ListFTIndexesReq', 'ListFTIndexesResp', 'QueryDesc', 'Session', 'CreateSessionReq', 'CreateSessionResp', 'UpdateSessionsReq', 'UpdateSessionsResp', 'ListSessionsReq', 'ListSessionsResp', 'GetSessionReq', 'GetSessionResp', 'RemoveSessionReq', 'RemoveSessionResp', 'KillQueryReq', 'ReportTaskReq', 'ListClusterInfoResp', 'ListClusterInfoReq', 'GetMetaDirInfoResp', 'GetMetaDirInfoReq', 'VerifyClientVersionResp', 'VerifyClientVersionReq', 'SaveGraphVersionResp', 'SaveGraphVersionReq', 'SchemaVer', 'ClusterID'] class AlterSchemaOp: ADD = 1 @@ -250,6 +250,7 @@ class ListHostType: META = 2 STORAGE = 3 AGENT = 4 + STORAGE_LISTENER = 5 _VALUES_TO_NAMES = { 0: "ALLOC", @@ -257,6 +258,7 @@ class ListHostType: 2: "META", 3: "STORAGE", 4: "AGENT", + 5: "STORAGE_LISTENER", } _NAMES_TO_VALUES = { @@ -265,13 +267,14 @@ class ListHostType: "META": 2, "STORAGE": 3, "AGENT": 4, + "STORAGE_LISTENER": 5, } class HostRole: GRAPH = 0 META = 1 STORAGE = 2 - LISTENER = 3 + STORAGE_LISTENER = 3 AGENT = 4 UNKNOWN = 5 @@ -279,7 +282,7 @@ class HostRole: 0: "GRAPH", 1: "META", 2: "STORAGE", - 3: "LISTENER", + 3: "STORAGE_LISTENER", 4: "AGENT", 5: "UNKNOWN", } @@ -288,7 +291,7 @@ class HostRole: "GRAPH": 0, "META": 1, "STORAGE": 2, - "LISTENER": 3, + "STORAGE_LISTENER": 3, "AGENT": 4, "UNKNOWN": 5, } @@ -11382,7 +11385,7 @@ def __ne__(self, other): class DropSnapshotReq: """ Attributes: - - name + - names """ thrift_spec = None @@ -11406,8 +11409,18 @@ def read(self, iprot): if ftype == TType.STOP: break if fid == 1: - if ftype == TType.STRING: - self.name = iprot.readString() + if ftype == TType.LIST: + self.names = [] + (_etype474, _size471) = iprot.readListBegin() + if _size471 >= 0: + for _i475 in range(_size471): + _elem476 = iprot.readString() + self.names.append(_elem476) + else: + while iprot.peekList(): + _elem477 = iprot.readString() + self.names.append(_elem477) + iprot.readListEnd() else: iprot.skip(ftype) else: @@ -11423,9 +11436,12 @@ def write(self, oprot): oprot.trans.write(fastproto.encode(self, [self.__class__, self.thrift_spec, False], utf8strings=UTF8STRINGS, protoid=2)) return oprot.writeStructBegin('DropSnapshotReq') - if self.name != None: - oprot.writeFieldBegin('name', TType.STRING, 1) - oprot.writeString(self.name) + if self.names != None: + oprot.writeFieldBegin('names', TType.LIST, 1) + oprot.writeListBegin(TType.STRING, len(self.names)) + for iter478 in self.names: + oprot.writeString(iter478) + oprot.writeListEnd() oprot.writeFieldEnd() oprot.writeFieldStop() oprot.writeStructEnd() @@ -11433,10 +11449,10 @@ def write(self, oprot): def __repr__(self): L = [] padding = ' ' * 4 - if self.name is not None: - value = pprint.pformat(self.name, indent=0) + if self.names is not None: + value = pprint.pformat(self.names, indent=0) value = padding.join(value.splitlines(True)) - L.append(' name=%s' % (value)) + L.append(' names=%s' % (value)) return "%s(%s)" % (self.__class__.__name__, "\n" + ",\n".join(L) if L else '') def __eq__(self, other): @@ -11647,17 +11663,17 @@ def read(self, iprot): elif fid == 3: if ftype == TType.LIST: self.snapshots = [] - (_etype474, _size471) = iprot.readListBegin() - if _size471 >= 0: - for _i475 in range(_size471): - _elem476 = Snapshot() - _elem476.read(iprot) - self.snapshots.append(_elem476) + (_etype482, _size479) = iprot.readListBegin() + if _size479 >= 0: + for _i483 in range(_size479): + _elem484 = Snapshot() + _elem484.read(iprot) + self.snapshots.append(_elem484) else: while iprot.peekList(): - _elem477 = Snapshot() - _elem477.read(iprot) - self.snapshots.append(_elem477) + _elem485 = Snapshot() + _elem485.read(iprot) + self.snapshots.append(_elem485) iprot.readListEnd() else: iprot.skip(ftype) @@ -11685,8 +11701,8 @@ def write(self, oprot): if self.snapshots != None: oprot.writeFieldBegin('snapshots', TType.LIST, 3) oprot.writeListBegin(TType.STRUCT, len(self.snapshots)) - for iter478 in self.snapshots: - iter478.write(oprot) + for iter486 in self.snapshots: + iter486.write(oprot) oprot.writeListEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -11921,17 +11937,17 @@ def read(self, iprot): elif fid == 3: if ftype == TType.LIST: self.statuses = [] - (_etype482, _size479) = iprot.readListBegin() - if _size479 >= 0: - for _i483 in range(_size479): - _elem484 = IndexStatus() - _elem484.read(iprot) - self.statuses.append(_elem484) + (_etype490, _size487) = iprot.readListBegin() + if _size487 >= 0: + for _i491 in range(_size487): + _elem492 = IndexStatus() + _elem492.read(iprot) + self.statuses.append(_elem492) else: while iprot.peekList(): - _elem485 = IndexStatus() - _elem485.read(iprot) - self.statuses.append(_elem485) + _elem493 = IndexStatus() + _elem493.read(iprot) + self.statuses.append(_elem493) iprot.readListEnd() else: iprot.skip(ftype) @@ -11959,8 +11975,8 @@ def write(self, oprot): if self.statuses != None: oprot.writeFieldBegin('statuses', TType.LIST, 3) oprot.writeListBegin(TType.STRUCT, len(self.statuses)) - for iter486 in self.statuses: - iter486.write(oprot) + for iter494 in self.statuses: + iter494.write(oprot) oprot.writeListEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -12025,15 +12041,15 @@ def read(self, iprot): if fid == 1: if ftype == TType.LIST: self.zones = [] - (_etype490, _size487) = iprot.readListBegin() - if _size487 >= 0: - for _i491 in range(_size487): - _elem492 = iprot.readString() - self.zones.append(_elem492) + (_etype498, _size495) = iprot.readListBegin() + if _size495 >= 0: + for _i499 in range(_size495): + _elem500 = iprot.readString() + self.zones.append(_elem500) else: while iprot.peekList(): - _elem493 = iprot.readString() - self.zones.append(_elem493) + _elem501 = iprot.readString() + self.zones.append(_elem501) iprot.readListEnd() else: iprot.skip(ftype) @@ -12058,8 +12074,8 @@ def write(self, oprot): if self.zones != None: oprot.writeFieldBegin('zones', TType.LIST, 1) oprot.writeListBegin(TType.STRING, len(self.zones)) - for iter494 in self.zones: - oprot.writeString(iter494) + for iter502 in self.zones: + oprot.writeString(iter502) oprot.writeListEnd() oprot.writeFieldEnd() if self.zone_name != None: @@ -12201,41 +12217,41 @@ def read(self, iprot): elif fid == 2: if ftype == TType.MAP: self.zone_items = {} - (_ktype496, _vtype497, _size495 ) = iprot.readMapBegin() - if _size495 >= 0: - for _i499 in range(_size495): - _key500 = iprot.readString() - _val501 = [] - (_etype505, _size502) = iprot.readListBegin() - if _size502 >= 0: - for _i506 in range(_size502): - _elem507 = nebula3.common.ttypes.HostAddr() - _elem507.read(iprot) - _val501.append(_elem507) + (_ktype504, _vtype505, _size503 ) = iprot.readMapBegin() + if _size503 >= 0: + for _i507 in range(_size503): + _key508 = iprot.readString() + _val509 = [] + (_etype513, _size510) = iprot.readListBegin() + if _size510 >= 0: + for _i514 in range(_size510): + _elem515 = nebula3.common.ttypes.HostAddr() + _elem515.read(iprot) + _val509.append(_elem515) else: while iprot.peekList(): - _elem508 = nebula3.common.ttypes.HostAddr() - _elem508.read(iprot) - _val501.append(_elem508) + _elem516 = nebula3.common.ttypes.HostAddr() + _elem516.read(iprot) + _val509.append(_elem516) iprot.readListEnd() - self.zone_items[_key500] = _val501 + self.zone_items[_key508] = _val509 else: while iprot.peekMap(): - _key509 = iprot.readString() - _val510 = [] - (_etype514, _size511) = iprot.readListBegin() - if _size511 >= 0: - for _i515 in range(_size511): - _elem516 = nebula3.common.ttypes.HostAddr() - _elem516.read(iprot) - _val510.append(_elem516) + _key517 = iprot.readString() + _val518 = [] + (_etype522, _size519) = iprot.readListBegin() + if _size519 >= 0: + for _i523 in range(_size519): + _elem524 = nebula3.common.ttypes.HostAddr() + _elem524.read(iprot) + _val518.append(_elem524) else: while iprot.peekList(): - _elem517 = nebula3.common.ttypes.HostAddr() - _elem517.read(iprot) - _val510.append(_elem517) + _elem525 = nebula3.common.ttypes.HostAddr() + _elem525.read(iprot) + _val518.append(_elem525) iprot.readListEnd() - self.zone_items[_key509] = _val510 + self.zone_items[_key517] = _val518 iprot.readMapEnd() else: iprot.skip(ftype) @@ -12259,11 +12275,11 @@ def write(self, oprot): if self.zone_items != None: oprot.writeFieldBegin('zone_items', TType.MAP, 2) oprot.writeMapBegin(TType.STRING, TType.LIST, len(self.zone_items)) - for kiter518,viter519 in self.zone_items.items(): - oprot.writeString(kiter518) - oprot.writeListBegin(TType.STRUCT, len(viter519)) - for iter520 in viter519: - iter520.write(oprot) + for kiter526,viter527 in self.zone_items.items(): + oprot.writeString(kiter526) + oprot.writeListBegin(TType.STRUCT, len(viter527)) + for iter528 in viter527: + iter528.write(oprot) oprot.writeListEnd() oprot.writeMapEnd() oprot.writeFieldEnd() @@ -12412,17 +12428,17 @@ def read(self, iprot): if fid == 1: if ftype == TType.LIST: self.hosts = [] - (_etype524, _size521) = iprot.readListBegin() - if _size521 >= 0: - for _i525 in range(_size521): - _elem526 = nebula3.common.ttypes.HostAddr() - _elem526.read(iprot) - self.hosts.append(_elem526) + (_etype532, _size529) = iprot.readListBegin() + if _size529 >= 0: + for _i533 in range(_size529): + _elem534 = nebula3.common.ttypes.HostAddr() + _elem534.read(iprot) + self.hosts.append(_elem534) else: while iprot.peekList(): - _elem527 = nebula3.common.ttypes.HostAddr() - _elem527.read(iprot) - self.hosts.append(_elem527) + _elem535 = nebula3.common.ttypes.HostAddr() + _elem535.read(iprot) + self.hosts.append(_elem535) iprot.readListEnd() else: iprot.skip(ftype) @@ -12452,8 +12468,8 @@ def write(self, oprot): if self.hosts != None: oprot.writeFieldBegin('hosts', TType.LIST, 1) oprot.writeListBegin(TType.STRUCT, len(self.hosts)) - for iter528 in self.hosts: - iter528.write(oprot) + for iter536 in self.hosts: + iter536.write(oprot) oprot.writeListEnd() oprot.writeFieldEnd() if self.zone_name != None: @@ -12610,17 +12626,17 @@ def read(self, iprot): elif fid == 3: if ftype == TType.LIST: self.hosts = [] - (_etype532, _size529) = iprot.readListBegin() - if _size529 >= 0: - for _i533 in range(_size529): - _elem534 = nebula3.common.ttypes.HostAddr() - _elem534.read(iprot) - self.hosts.append(_elem534) + (_etype540, _size537) = iprot.readListBegin() + if _size537 >= 0: + for _i541 in range(_size537): + _elem542 = nebula3.common.ttypes.HostAddr() + _elem542.read(iprot) + self.hosts.append(_elem542) else: while iprot.peekList(): - _elem535 = nebula3.common.ttypes.HostAddr() - _elem535.read(iprot) - self.hosts.append(_elem535) + _elem543 = nebula3.common.ttypes.HostAddr() + _elem543.read(iprot) + self.hosts.append(_elem543) iprot.readListEnd() else: iprot.skip(ftype) @@ -12648,8 +12664,8 @@ def write(self, oprot): if self.hosts != None: oprot.writeFieldBegin('hosts', TType.LIST, 3) oprot.writeListBegin(TType.STRUCT, len(self.hosts)) - for iter536 in self.hosts: - iter536.write(oprot) + for iter544 in self.hosts: + iter544.write(oprot) oprot.writeListEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -12773,17 +12789,17 @@ def read(self, iprot): elif fid == 2: if ftype == TType.LIST: self.nodes = [] - (_etype540, _size537) = iprot.readListBegin() - if _size537 >= 0: - for _i541 in range(_size537): - _elem542 = nebula3.common.ttypes.HostAddr() - _elem542.read(iprot) - self.nodes.append(_elem542) + (_etype548, _size545) = iprot.readListBegin() + if _size545 >= 0: + for _i549 in range(_size545): + _elem550 = nebula3.common.ttypes.HostAddr() + _elem550.read(iprot) + self.nodes.append(_elem550) else: while iprot.peekList(): - _elem543 = nebula3.common.ttypes.HostAddr() - _elem543.read(iprot) - self.nodes.append(_elem543) + _elem551 = nebula3.common.ttypes.HostAddr() + _elem551.read(iprot) + self.nodes.append(_elem551) iprot.readListEnd() else: iprot.skip(ftype) @@ -12807,8 +12823,8 @@ def write(self, oprot): if self.nodes != None: oprot.writeFieldBegin('nodes', TType.LIST, 2) oprot.writeListBegin(TType.STRUCT, len(self.nodes)) - for iter544 in self.nodes: - iter544.write(oprot) + for iter552 in self.nodes: + iter552.write(oprot) oprot.writeListEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -12881,17 +12897,17 @@ def read(self, iprot): elif fid == 3: if ftype == TType.LIST: self.zones = [] - (_etype548, _size545) = iprot.readListBegin() - if _size545 >= 0: - for _i549 in range(_size545): - _elem550 = Zone() - _elem550.read(iprot) - self.zones.append(_elem550) + (_etype556, _size553) = iprot.readListBegin() + if _size553 >= 0: + for _i557 in range(_size553): + _elem558 = Zone() + _elem558.read(iprot) + self.zones.append(_elem558) else: while iprot.peekList(): - _elem551 = Zone() - _elem551.read(iprot) - self.zones.append(_elem551) + _elem559 = Zone() + _elem559.read(iprot) + self.zones.append(_elem559) iprot.readListEnd() else: iprot.skip(ftype) @@ -12919,8 +12935,8 @@ def write(self, oprot): if self.zones != None: oprot.writeFieldBegin('zones', TType.LIST, 3) oprot.writeListBegin(TType.STRUCT, len(self.zones)) - for iter552 in self.zones: - iter552.write(oprot) + for iter560 in self.zones: + iter560.write(oprot) oprot.writeListEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -12996,17 +13012,17 @@ def read(self, iprot): elif fid == 3: if ftype == TType.LIST: self.hosts = [] - (_etype556, _size553) = iprot.readListBegin() - if _size553 >= 0: - for _i557 in range(_size553): - _elem558 = nebula3.common.ttypes.HostAddr() - _elem558.read(iprot) - self.hosts.append(_elem558) + (_etype564, _size561) = iprot.readListBegin() + if _size561 >= 0: + for _i565 in range(_size561): + _elem566 = nebula3.common.ttypes.HostAddr() + _elem566.read(iprot) + self.hosts.append(_elem566) else: while iprot.peekList(): - _elem559 = nebula3.common.ttypes.HostAddr() - _elem559.read(iprot) - self.hosts.append(_elem559) + _elem567 = nebula3.common.ttypes.HostAddr() + _elem567.read(iprot) + self.hosts.append(_elem567) iprot.readListEnd() else: iprot.skip(ftype) @@ -13034,8 +13050,8 @@ def write(self, oprot): if self.hosts != None: oprot.writeFieldBegin('hosts', TType.LIST, 3) oprot.writeListBegin(TType.STRUCT, len(self.hosts)) - for iter560 in self.hosts: - iter560.write(oprot) + for iter568 in self.hosts: + iter568.write(oprot) oprot.writeListEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -13385,17 +13401,17 @@ def read(self, iprot): elif fid == 3: if ftype == TType.LIST: self.listeners = [] - (_etype564, _size561) = iprot.readListBegin() - if _size561 >= 0: - for _i565 in range(_size561): - _elem566 = ListenerInfo() - _elem566.read(iprot) - self.listeners.append(_elem566) + (_etype572, _size569) = iprot.readListBegin() + if _size569 >= 0: + for _i573 in range(_size569): + _elem574 = ListenerInfo() + _elem574.read(iprot) + self.listeners.append(_elem574) else: while iprot.peekList(): - _elem567 = ListenerInfo() - _elem567.read(iprot) - self.listeners.append(_elem567) + _elem575 = ListenerInfo() + _elem575.read(iprot) + self.listeners.append(_elem575) iprot.readListEnd() else: iprot.skip(ftype) @@ -13423,8 +13439,8 @@ def write(self, oprot): if self.listeners != None: oprot.writeFieldBegin('listeners', TType.LIST, 3) oprot.writeListBegin(TType.STRUCT, len(self.listeners)) - for iter568 in self.listeners: - iter568.write(oprot) + for iter576 in self.listeners: + iter576.write(oprot) oprot.writeListEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -13669,17 +13685,17 @@ def read(self, iprot): elif fid == 2: if ftype == TType.LIST: self.checkpoints = [] - (_etype572, _size569) = iprot.readListBegin() - if _size569 >= 0: - for _i573 in range(_size569): - _elem574 = nebula3.common.ttypes.CheckpointInfo() - _elem574.read(iprot) - self.checkpoints.append(_elem574) + (_etype580, _size577) = iprot.readListBegin() + if _size577 >= 0: + for _i581 in range(_size577): + _elem582 = nebula3.common.ttypes.CheckpointInfo() + _elem582.read(iprot) + self.checkpoints.append(_elem582) else: while iprot.peekList(): - _elem575 = nebula3.common.ttypes.CheckpointInfo() - _elem575.read(iprot) - self.checkpoints.append(_elem575) + _elem583 = nebula3.common.ttypes.CheckpointInfo() + _elem583.read(iprot) + self.checkpoints.append(_elem583) iprot.readListEnd() else: iprot.skip(ftype) @@ -13703,8 +13719,8 @@ def write(self, oprot): if self.checkpoints != None: oprot.writeFieldBegin('checkpoints', TType.LIST, 2) oprot.writeListBegin(TType.STRUCT, len(self.checkpoints)) - for iter576 in self.checkpoints: - iter576.write(oprot) + for iter584 in self.checkpoints: + iter584.write(oprot) oprot.writeListEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -13771,17 +13787,17 @@ def read(self, iprot): elif fid == 2: if ftype == TType.LIST: self.host_backups = [] - (_etype580, _size577) = iprot.readListBegin() - if _size577 >= 0: - for _i581 in range(_size577): - _elem582 = HostBackupInfo() - _elem582.read(iprot) - self.host_backups.append(_elem582) + (_etype588, _size585) = iprot.readListBegin() + if _size585 >= 0: + for _i589 in range(_size585): + _elem590 = HostBackupInfo() + _elem590.read(iprot) + self.host_backups.append(_elem590) else: while iprot.peekList(): - _elem583 = HostBackupInfo() - _elem583.read(iprot) - self.host_backups.append(_elem583) + _elem591 = HostBackupInfo() + _elem591.read(iprot) + self.host_backups.append(_elem591) iprot.readListEnd() else: iprot.skip(ftype) @@ -13805,8 +13821,8 @@ def write(self, oprot): if self.host_backups != None: oprot.writeFieldBegin('host_backups', TType.LIST, 2) oprot.writeListBegin(TType.STRUCT, len(self.host_backups)) - for iter584 in self.host_backups: - iter584.write(oprot) + for iter592 in self.host_backups: + iter592.write(oprot) oprot.writeListEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -13846,6 +13862,9 @@ class BackupMeta: - full - all_spaces - create_time + - base_backup_name + - storage_hosts + - cluster_id """ thrift_spec = None @@ -13871,34 +13890,34 @@ def read(self, iprot): if fid == 1: if ftype == TType.MAP: self.space_backups = {} - (_ktype586, _vtype587, _size585 ) = iprot.readMapBegin() - if _size585 >= 0: - for _i589 in range(_size585): - _key590 = iprot.readI32() - _val591 = SpaceBackupInfo() - _val591.read(iprot) - self.space_backups[_key590] = _val591 + (_ktype594, _vtype595, _size593 ) = iprot.readMapBegin() + if _size593 >= 0: + for _i597 in range(_size593): + _key598 = iprot.readI32() + _val599 = SpaceBackupInfo() + _val599.read(iprot) + self.space_backups[_key598] = _val599 else: while iprot.peekMap(): - _key592 = iprot.readI32() - _val593 = SpaceBackupInfo() - _val593.read(iprot) - self.space_backups[_key592] = _val593 + _key600 = iprot.readI32() + _val601 = SpaceBackupInfo() + _val601.read(iprot) + self.space_backups[_key600] = _val601 iprot.readMapEnd() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.LIST: self.meta_files = [] - (_etype597, _size594) = iprot.readListBegin() - if _size594 >= 0: - for _i598 in range(_size594): - _elem599 = iprot.readString() - self.meta_files.append(_elem599) + (_etype605, _size602) = iprot.readListBegin() + if _size602 >= 0: + for _i606 in range(_size602): + _elem607 = iprot.readString() + self.meta_files.append(_elem607) else: while iprot.peekList(): - _elem600 = iprot.readString() - self.meta_files.append(_elem600) + _elem608 = iprot.readString() + self.meta_files.append(_elem608) iprot.readListEnd() else: iprot.skip(ftype) @@ -13922,6 +13941,33 @@ def read(self, iprot): self.create_time = iprot.readI64() else: iprot.skip(ftype) + elif fid == 7: + if ftype == TType.STRING: + self.base_backup_name = iprot.readString() + else: + iprot.skip(ftype) + elif fid == 8: + if ftype == TType.LIST: + self.storage_hosts = [] + (_etype612, _size609) = iprot.readListBegin() + if _size609 >= 0: + for _i613 in range(_size609): + _elem614 = nebula3.common.ttypes.HostAddr() + _elem614.read(iprot) + self.storage_hosts.append(_elem614) + else: + while iprot.peekList(): + _elem615 = nebula3.common.ttypes.HostAddr() + _elem615.read(iprot) + self.storage_hosts.append(_elem615) + iprot.readListEnd() + else: + iprot.skip(ftype) + elif fid == 9: + if ftype == TType.I64: + self.cluster_id = iprot.readI64() + else: + iprot.skip(ftype) else: iprot.skip(ftype) iprot.readFieldEnd() @@ -13938,16 +13984,16 @@ def write(self, oprot): if self.space_backups != None: oprot.writeFieldBegin('space_backups', TType.MAP, 1) oprot.writeMapBegin(TType.I32, TType.STRUCT, len(self.space_backups)) - for kiter601,viter602 in self.space_backups.items(): - oprot.writeI32(kiter601) - viter602.write(oprot) + for kiter616,viter617 in self.space_backups.items(): + oprot.writeI32(kiter616) + viter617.write(oprot) oprot.writeMapEnd() oprot.writeFieldEnd() if self.meta_files != None: oprot.writeFieldBegin('meta_files', TType.LIST, 2) oprot.writeListBegin(TType.STRING, len(self.meta_files)) - for iter603 in self.meta_files: - oprot.writeString(iter603) + for iter618 in self.meta_files: + oprot.writeString(iter618) oprot.writeListEnd() oprot.writeFieldEnd() if self.backup_name != None: @@ -13966,6 +14012,21 @@ def write(self, oprot): oprot.writeFieldBegin('create_time', TType.I64, 6) oprot.writeI64(self.create_time) oprot.writeFieldEnd() + if self.base_backup_name != None: + oprot.writeFieldBegin('base_backup_name', TType.STRING, 7) + oprot.writeString(self.base_backup_name) + oprot.writeFieldEnd() + if self.storage_hosts != None: + oprot.writeFieldBegin('storage_hosts', TType.LIST, 8) + oprot.writeListBegin(TType.STRUCT, len(self.storage_hosts)) + for iter619 in self.storage_hosts: + iter619.write(oprot) + oprot.writeListEnd() + oprot.writeFieldEnd() + if self.cluster_id != None: + oprot.writeFieldBegin('cluster_id', TType.I64, 9) + oprot.writeI64(self.cluster_id) + oprot.writeFieldEnd() oprot.writeFieldStop() oprot.writeStructEnd() @@ -13996,6 +14057,18 @@ def __repr__(self): value = pprint.pformat(self.create_time, indent=0) value = padding.join(value.splitlines(True)) L.append(' create_time=%s' % (value)) + if self.base_backup_name is not None: + value = pprint.pformat(self.base_backup_name, indent=0) + value = padding.join(value.splitlines(True)) + L.append(' base_backup_name=%s' % (value)) + if self.storage_hosts is not None: + value = pprint.pformat(self.storage_hosts, indent=0) + value = padding.join(value.splitlines(True)) + L.append(' storage_hosts=%s' % (value)) + if self.cluster_id is not None: + value = pprint.pformat(self.cluster_id, indent=0) + value = padding.join(value.splitlines(True)) + L.append(' cluster_id=%s' % (value)) return "%s(%s)" % (self.__class__.__name__, "\n" + ",\n".join(L) if L else '') def __eq__(self, other): @@ -14014,6 +14087,8 @@ class CreateBackupReq: """ Attributes: - spaces + - base_backup_name + - cluster_id """ thrift_spec = None @@ -14039,18 +14114,28 @@ def read(self, iprot): if fid == 1: if ftype == TType.LIST: self.spaces = [] - (_etype607, _size604) = iprot.readListBegin() - if _size604 >= 0: - for _i608 in range(_size604): - _elem609 = iprot.readString() - self.spaces.append(_elem609) + (_etype623, _size620) = iprot.readListBegin() + if _size620 >= 0: + for _i624 in range(_size620): + _elem625 = iprot.readString() + self.spaces.append(_elem625) else: while iprot.peekList(): - _elem610 = iprot.readString() - self.spaces.append(_elem610) + _elem626 = iprot.readString() + self.spaces.append(_elem626) iprot.readListEnd() else: iprot.skip(ftype) + elif fid == 2: + if ftype == TType.STRING: + self.base_backup_name = iprot.readString() + else: + iprot.skip(ftype) + elif fid == 3: + if ftype == TType.I64: + self.cluster_id = iprot.readI64() + else: + iprot.skip(ftype) else: iprot.skip(ftype) iprot.readFieldEnd() @@ -14067,10 +14152,18 @@ def write(self, oprot): if self.spaces != None: oprot.writeFieldBegin('spaces', TType.LIST, 1) oprot.writeListBegin(TType.STRING, len(self.spaces)) - for iter611 in self.spaces: - oprot.writeString(iter611) + for iter627 in self.spaces: + oprot.writeString(iter627) oprot.writeListEnd() oprot.writeFieldEnd() + if self.base_backup_name != None: + oprot.writeFieldBegin('base_backup_name', TType.STRING, 2) + oprot.writeString(self.base_backup_name) + oprot.writeFieldEnd() + if self.cluster_id != None: + oprot.writeFieldBegin('cluster_id', TType.I64, 3) + oprot.writeI64(self.cluster_id) + oprot.writeFieldEnd() oprot.writeFieldStop() oprot.writeStructEnd() @@ -14081,6 +14174,14 @@ def __repr__(self): value = pprint.pformat(self.spaces, indent=0) value = padding.join(value.splitlines(True)) L.append(' spaces=%s' % (value)) + if self.base_backup_name is not None: + value = pprint.pformat(self.base_backup_name, indent=0) + value = padding.join(value.splitlines(True)) + L.append(' base_backup_name=%s' % (value)) + if self.cluster_id is not None: + value = pprint.pformat(self.cluster_id, indent=0) + value = padding.join(value.splitlines(True)) + L.append(' cluster_id=%s' % (value)) return "%s(%s)" % (self.__class__.__name__, "\n" + ",\n".join(L) if L else '') def __eq__(self, other): @@ -14263,14 +14364,229 @@ def write(self, oprot): def __repr__(self): L = [] padding = ' ' * 4 - if self.from_host is not None: - value = pprint.pformat(self.from_host, indent=0) + if self.from_host is not None: + value = pprint.pformat(self.from_host, indent=0) + value = padding.join(value.splitlines(True)) + L.append(' from_host=%s' % (value)) + if self.to_host is not None: + value = pprint.pformat(self.to_host, indent=0) + value = padding.join(value.splitlines(True)) + L.append(' to_host=%s' % (value)) + return "%s(%s)" % (self.__class__.__name__, "\n" + ",\n".join(L) if L else '') + + def __eq__(self, other): + if not isinstance(other, self.__class__): + return False + + return self.__dict__ == other.__dict__ + + def __ne__(self, other): + return not (self == other) + + # Override the __hash__ function for Python3 - t10434117 + __hash__ = object.__hash__ + +class RestoreMetaReq: + """ + Attributes: + - files + - hosts + """ + + thrift_spec = None + thrift_field_annotations = None + thrift_struct_annotations = None + __init__ = None + @staticmethod + def isUnion(): + return False + + def read(self, iprot): + if (isinstance(iprot, TBinaryProtocol.TBinaryProtocolAccelerated) or (isinstance(iprot, THeaderProtocol.THeaderProtocolAccelerate) and iprot.get_protocol_id() == THeaderProtocol.THeaderProtocol.T_BINARY_PROTOCOL)) and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastproto is not None: + fastproto.decode(self, iprot.trans, [self.__class__, self.thrift_spec, False], utf8strings=UTF8STRINGS, protoid=0) + return + if (isinstance(iprot, TCompactProtocol.TCompactProtocolAccelerated) or (isinstance(iprot, THeaderProtocol.THeaderProtocolAccelerate) and iprot.get_protocol_id() == THeaderProtocol.THeaderProtocol.T_COMPACT_PROTOCOL)) and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastproto is not None: + fastproto.decode(self, iprot.trans, [self.__class__, self.thrift_spec, False], utf8strings=UTF8STRINGS, protoid=2) + return + iprot.readStructBegin() + while True: + (fname, ftype, fid) = iprot.readFieldBegin() + if ftype == TType.STOP: + break + if fid == 1: + if ftype == TType.LIST: + self.files = [] + (_etype631, _size628) = iprot.readListBegin() + if _size628 >= 0: + for _i632 in range(_size628): + _elem633 = iprot.readString() + self.files.append(_elem633) + else: + while iprot.peekList(): + _elem634 = iprot.readString() + self.files.append(_elem634) + iprot.readListEnd() + else: + iprot.skip(ftype) + elif fid == 2: + if ftype == TType.LIST: + self.hosts = [] + (_etype638, _size635) = iprot.readListBegin() + if _size635 >= 0: + for _i639 in range(_size635): + _elem640 = HostPair() + _elem640.read(iprot) + self.hosts.append(_elem640) + else: + while iprot.peekList(): + _elem641 = HostPair() + _elem641.read(iprot) + self.hosts.append(_elem641) + iprot.readListEnd() + else: + iprot.skip(ftype) + else: + iprot.skip(ftype) + iprot.readFieldEnd() + iprot.readStructEnd() + + def write(self, oprot): + if (isinstance(oprot, TBinaryProtocol.TBinaryProtocolAccelerated) or (isinstance(oprot, THeaderProtocol.THeaderProtocolAccelerate) and oprot.get_protocol_id() == THeaderProtocol.THeaderProtocol.T_BINARY_PROTOCOL)) and self.thrift_spec is not None and fastproto is not None: + oprot.trans.write(fastproto.encode(self, [self.__class__, self.thrift_spec, False], utf8strings=UTF8STRINGS, protoid=0)) + return + if (isinstance(oprot, TCompactProtocol.TCompactProtocolAccelerated) or (isinstance(oprot, THeaderProtocol.THeaderProtocolAccelerate) and oprot.get_protocol_id() == THeaderProtocol.THeaderProtocol.T_COMPACT_PROTOCOL)) and self.thrift_spec is not None and fastproto is not None: + oprot.trans.write(fastproto.encode(self, [self.__class__, self.thrift_spec, False], utf8strings=UTF8STRINGS, protoid=2)) + return + oprot.writeStructBegin('RestoreMetaReq') + if self.files != None: + oprot.writeFieldBegin('files', TType.LIST, 1) + oprot.writeListBegin(TType.STRING, len(self.files)) + for iter642 in self.files: + oprot.writeString(iter642) + oprot.writeListEnd() + oprot.writeFieldEnd() + if self.hosts != None: + oprot.writeFieldBegin('hosts', TType.LIST, 2) + oprot.writeListBegin(TType.STRUCT, len(self.hosts)) + for iter643 in self.hosts: + iter643.write(oprot) + oprot.writeListEnd() + oprot.writeFieldEnd() + oprot.writeFieldStop() + oprot.writeStructEnd() + + def __repr__(self): + L = [] + padding = ' ' * 4 + if self.files is not None: + value = pprint.pformat(self.files, indent=0) + value = padding.join(value.splitlines(True)) + L.append(' files=%s' % (value)) + if self.hosts is not None: + value = pprint.pformat(self.hosts, indent=0) + value = padding.join(value.splitlines(True)) + L.append(' hosts=%s' % (value)) + return "%s(%s)" % (self.__class__.__name__, "\n" + ",\n".join(L) if L else '') + + def __eq__(self, other): + if not isinstance(other, self.__class__): + return False + + return self.__dict__ == other.__dict__ + + def __ne__(self, other): + return not (self == other) + + # Override the __hash__ function for Python3 - t10434117 + __hash__ = object.__hash__ + +class PartInfo: + """ + Attributes: + - part_id + - hosts + """ + + thrift_spec = None + thrift_field_annotations = None + thrift_struct_annotations = None + __init__ = None + @staticmethod + def isUnion(): + return False + + def read(self, iprot): + if (isinstance(iprot, TBinaryProtocol.TBinaryProtocolAccelerated) or (isinstance(iprot, THeaderProtocol.THeaderProtocolAccelerate) and iprot.get_protocol_id() == THeaderProtocol.THeaderProtocol.T_BINARY_PROTOCOL)) and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastproto is not None: + fastproto.decode(self, iprot.trans, [self.__class__, self.thrift_spec, False], utf8strings=UTF8STRINGS, protoid=0) + return + if (isinstance(iprot, TCompactProtocol.TCompactProtocolAccelerated) or (isinstance(iprot, THeaderProtocol.THeaderProtocolAccelerate) and iprot.get_protocol_id() == THeaderProtocol.THeaderProtocol.T_COMPACT_PROTOCOL)) and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastproto is not None: + fastproto.decode(self, iprot.trans, [self.__class__, self.thrift_spec, False], utf8strings=UTF8STRINGS, protoid=2) + return + iprot.readStructBegin() + while True: + (fname, ftype, fid) = iprot.readFieldBegin() + if ftype == TType.STOP: + break + if fid == 1: + if ftype == TType.I32: + self.part_id = iprot.readI32() + else: + iprot.skip(ftype) + elif fid == 2: + if ftype == TType.LIST: + self.hosts = [] + (_etype647, _size644) = iprot.readListBegin() + if _size644 >= 0: + for _i648 in range(_size644): + _elem649 = nebula3.common.ttypes.HostAddr() + _elem649.read(iprot) + self.hosts.append(_elem649) + else: + while iprot.peekList(): + _elem650 = nebula3.common.ttypes.HostAddr() + _elem650.read(iprot) + self.hosts.append(_elem650) + iprot.readListEnd() + else: + iprot.skip(ftype) + else: + iprot.skip(ftype) + iprot.readFieldEnd() + iprot.readStructEnd() + + def write(self, oprot): + if (isinstance(oprot, TBinaryProtocol.TBinaryProtocolAccelerated) or (isinstance(oprot, THeaderProtocol.THeaderProtocolAccelerate) and oprot.get_protocol_id() == THeaderProtocol.THeaderProtocol.T_BINARY_PROTOCOL)) and self.thrift_spec is not None and fastproto is not None: + oprot.trans.write(fastproto.encode(self, [self.__class__, self.thrift_spec, False], utf8strings=UTF8STRINGS, protoid=0)) + return + if (isinstance(oprot, TCompactProtocol.TCompactProtocolAccelerated) or (isinstance(oprot, THeaderProtocol.THeaderProtocolAccelerate) and oprot.get_protocol_id() == THeaderProtocol.THeaderProtocol.T_COMPACT_PROTOCOL)) and self.thrift_spec is not None and fastproto is not None: + oprot.trans.write(fastproto.encode(self, [self.__class__, self.thrift_spec, False], utf8strings=UTF8STRINGS, protoid=2)) + return + oprot.writeStructBegin('PartInfo') + if self.part_id != None: + oprot.writeFieldBegin('part_id', TType.I32, 1) + oprot.writeI32(self.part_id) + oprot.writeFieldEnd() + if self.hosts != None: + oprot.writeFieldBegin('hosts', TType.LIST, 2) + oprot.writeListBegin(TType.STRUCT, len(self.hosts)) + for iter651 in self.hosts: + iter651.write(oprot) + oprot.writeListEnd() + oprot.writeFieldEnd() + oprot.writeFieldStop() + oprot.writeStructEnd() + + def __repr__(self): + L = [] + padding = ' ' * 4 + if self.part_id is not None: + value = pprint.pformat(self.part_id, indent=0) value = padding.join(value.splitlines(True)) - L.append(' from_host=%s' % (value)) - if self.to_host is not None: - value = pprint.pformat(self.to_host, indent=0) + L.append(' part_id=%s' % (value)) + if self.hosts is not None: + value = pprint.pformat(self.hosts, indent=0) value = padding.join(value.splitlines(True)) - L.append(' to_host=%s' % (value)) + L.append(' hosts=%s' % (value)) return "%s(%s)" % (self.__class__.__name__, "\n" + ",\n".join(L) if L else '') def __eq__(self, other): @@ -14285,11 +14601,12 @@ def __ne__(self, other): # Override the __hash__ function for Python3 - t10434117 __hash__ = object.__hash__ -class RestoreMetaReq: +class RestoreMetaResp: """ Attributes: - - files - - hosts + - code + - leader + - part_hosts """ thrift_spec = None @@ -14313,35 +14630,55 @@ def read(self, iprot): if ftype == TType.STOP: break if fid == 1: - if ftype == TType.LIST: - self.files = [] - (_etype615, _size612) = iprot.readListBegin() - if _size612 >= 0: - for _i616 in range(_size612): - _elem617 = iprot.readString() - self.files.append(_elem617) - else: - while iprot.peekList(): - _elem618 = iprot.readString() - self.files.append(_elem618) - iprot.readListEnd() + if ftype == TType.I32: + self.code = iprot.readI32() else: iprot.skip(ftype) elif fid == 2: - if ftype == TType.LIST: - self.hosts = [] - (_etype622, _size619) = iprot.readListBegin() - if _size619 >= 0: - for _i623 in range(_size619): - _elem624 = HostPair() - _elem624.read(iprot) - self.hosts.append(_elem624) + if ftype == TType.STRUCT: + self.leader = nebula3.common.ttypes.HostAddr() + self.leader.read(iprot) + else: + iprot.skip(ftype) + elif fid == 3: + if ftype == TType.MAP: + self.part_hosts = {} + (_ktype653, _vtype654, _size652 ) = iprot.readMapBegin() + if _size652 >= 0: + for _i656 in range(_size652): + _key657 = iprot.readI32() + _val658 = [] + (_etype662, _size659) = iprot.readListBegin() + if _size659 >= 0: + for _i663 in range(_size659): + _elem664 = PartInfo() + _elem664.read(iprot) + _val658.append(_elem664) + else: + while iprot.peekList(): + _elem665 = PartInfo() + _elem665.read(iprot) + _val658.append(_elem665) + iprot.readListEnd() + self.part_hosts[_key657] = _val658 else: - while iprot.peekList(): - _elem625 = HostPair() - _elem625.read(iprot) - self.hosts.append(_elem625) - iprot.readListEnd() + while iprot.peekMap(): + _key666 = iprot.readI32() + _val667 = [] + (_etype671, _size668) = iprot.readListBegin() + if _size668 >= 0: + for _i672 in range(_size668): + _elem673 = PartInfo() + _elem673.read(iprot) + _val667.append(_elem673) + else: + while iprot.peekList(): + _elem674 = PartInfo() + _elem674.read(iprot) + _val667.append(_elem674) + iprot.readListEnd() + self.part_hosts[_key666] = _val667 + iprot.readMapEnd() else: iprot.skip(ftype) else: @@ -14356,20 +14693,25 @@ def write(self, oprot): if (isinstance(oprot, TCompactProtocol.TCompactProtocolAccelerated) or (isinstance(oprot, THeaderProtocol.THeaderProtocolAccelerate) and oprot.get_protocol_id() == THeaderProtocol.THeaderProtocol.T_COMPACT_PROTOCOL)) and self.thrift_spec is not None and fastproto is not None: oprot.trans.write(fastproto.encode(self, [self.__class__, self.thrift_spec, False], utf8strings=UTF8STRINGS, protoid=2)) return - oprot.writeStructBegin('RestoreMetaReq') - if self.files != None: - oprot.writeFieldBegin('files', TType.LIST, 1) - oprot.writeListBegin(TType.STRING, len(self.files)) - for iter626 in self.files: - oprot.writeString(iter626) - oprot.writeListEnd() + oprot.writeStructBegin('RestoreMetaResp') + if self.code != None: + oprot.writeFieldBegin('code', TType.I32, 1) + oprot.writeI32(self.code) oprot.writeFieldEnd() - if self.hosts != None: - oprot.writeFieldBegin('hosts', TType.LIST, 2) - oprot.writeListBegin(TType.STRUCT, len(self.hosts)) - for iter627 in self.hosts: - iter627.write(oprot) - oprot.writeListEnd() + if self.leader != None: + oprot.writeFieldBegin('leader', TType.STRUCT, 2) + self.leader.write(oprot) + oprot.writeFieldEnd() + if self.part_hosts != None: + oprot.writeFieldBegin('part_hosts', TType.MAP, 3) + oprot.writeMapBegin(TType.I32, TType.LIST, len(self.part_hosts)) + for kiter675,viter676 in self.part_hosts.items(): + oprot.writeI32(kiter675) + oprot.writeListBegin(TType.STRUCT, len(viter676)) + for iter677 in viter676: + iter677.write(oprot) + oprot.writeListEnd() + oprot.writeMapEnd() oprot.writeFieldEnd() oprot.writeFieldStop() oprot.writeStructEnd() @@ -14377,14 +14719,18 @@ def write(self, oprot): def __repr__(self): L = [] padding = ' ' * 4 - if self.files is not None: - value = pprint.pformat(self.files, indent=0) + if self.code is not None: + value = pprint.pformat(self.code, indent=0) value = padding.join(value.splitlines(True)) - L.append(' files=%s' % (value)) - if self.hosts is not None: - value = pprint.pformat(self.hosts, indent=0) + L.append(' code=%s' % (value)) + if self.leader is not None: + value = pprint.pformat(self.leader, indent=0) value = padding.join(value.splitlines(True)) - L.append(' hosts=%s' % (value)) + L.append(' leader=%s' % (value)) + if self.part_hosts is not None: + value = pprint.pformat(self.part_hosts, indent=0) + value = padding.join(value.splitlines(True)) + L.append(' part_hosts=%s' % (value)) return "%s(%s)" % (self.__class__.__name__, "\n" + ",\n".join(L) if L else '') def __eq__(self, other): @@ -14549,17 +14895,17 @@ def read(self, iprot): elif fid == 2: if ftype == TType.LIST: self.clients = [] - (_etype631, _size628) = iprot.readListBegin() - if _size628 >= 0: - for _i632 in range(_size628): - _elem633 = ServiceClient() - _elem633.read(iprot) - self.clients.append(_elem633) + (_etype681, _size678) = iprot.readListBegin() + if _size678 >= 0: + for _i682 in range(_size678): + _elem683 = ServiceClient() + _elem683.read(iprot) + self.clients.append(_elem683) else: while iprot.peekList(): - _elem634 = ServiceClient() - _elem634.read(iprot) - self.clients.append(_elem634) + _elem684 = ServiceClient() + _elem684.read(iprot) + self.clients.append(_elem684) iprot.readListEnd() else: iprot.skip(ftype) @@ -14583,8 +14929,8 @@ def write(self, oprot): if self.clients != None: oprot.writeFieldBegin('clients', TType.LIST, 2) oprot.writeListBegin(TType.STRUCT, len(self.clients)) - for iter635 in self.clients: - iter635.write(oprot) + for iter685 in self.clients: + iter685.write(oprot) oprot.writeListEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -14801,41 +15147,41 @@ def read(self, iprot): elif fid == 3: if ftype == TType.MAP: self.clients = {} - (_ktype637, _vtype638, _size636 ) = iprot.readMapBegin() - if _size636 >= 0: - for _i640 in range(_size636): - _key641 = iprot.readI32() - _val642 = [] - (_etype646, _size643) = iprot.readListBegin() - if _size643 >= 0: - for _i647 in range(_size643): - _elem648 = ServiceClient() - _elem648.read(iprot) - _val642.append(_elem648) + (_ktype687, _vtype688, _size686 ) = iprot.readMapBegin() + if _size686 >= 0: + for _i690 in range(_size686): + _key691 = iprot.readI32() + _val692 = [] + (_etype696, _size693) = iprot.readListBegin() + if _size693 >= 0: + for _i697 in range(_size693): + _elem698 = ServiceClient() + _elem698.read(iprot) + _val692.append(_elem698) else: while iprot.peekList(): - _elem649 = ServiceClient() - _elem649.read(iprot) - _val642.append(_elem649) + _elem699 = ServiceClient() + _elem699.read(iprot) + _val692.append(_elem699) iprot.readListEnd() - self.clients[_key641] = _val642 + self.clients[_key691] = _val692 else: while iprot.peekMap(): - _key650 = iprot.readI32() - _val651 = [] - (_etype655, _size652) = iprot.readListBegin() - if _size652 >= 0: - for _i656 in range(_size652): - _elem657 = ServiceClient() - _elem657.read(iprot) - _val651.append(_elem657) + _key700 = iprot.readI32() + _val701 = [] + (_etype705, _size702) = iprot.readListBegin() + if _size702 >= 0: + for _i706 in range(_size702): + _elem707 = ServiceClient() + _elem707.read(iprot) + _val701.append(_elem707) else: while iprot.peekList(): - _elem658 = ServiceClient() - _elem658.read(iprot) - _val651.append(_elem658) + _elem708 = ServiceClient() + _elem708.read(iprot) + _val701.append(_elem708) iprot.readListEnd() - self.clients[_key650] = _val651 + self.clients[_key700] = _val701 iprot.readMapEnd() else: iprot.skip(ftype) @@ -14863,11 +15209,11 @@ def write(self, oprot): if self.clients != None: oprot.writeFieldBegin('clients', TType.MAP, 3) oprot.writeMapBegin(TType.I32, TType.LIST, len(self.clients)) - for kiter659,viter660 in self.clients.items(): - oprot.writeI32(kiter659) - oprot.writeListBegin(TType.STRUCT, len(viter660)) - for iter661 in viter660: - iter661.write(oprot) + for kiter709,viter710 in self.clients.items(): + oprot.writeI32(kiter709) + oprot.writeListBegin(TType.STRUCT, len(viter710)) + for iter711 in viter710: + iter711.write(oprot) oprot.writeListEnd() oprot.writeMapEnd() oprot.writeFieldEnd() @@ -14945,15 +15291,15 @@ def read(self, iprot): elif fid == 3: if ftype == TType.LIST: self.fields = [] - (_etype665, _size662) = iprot.readListBegin() - if _size662 >= 0: - for _i666 in range(_size662): - _elem667 = iprot.readString() - self.fields.append(_elem667) + (_etype715, _size712) = iprot.readListBegin() + if _size712 >= 0: + for _i716 in range(_size712): + _elem717 = iprot.readString() + self.fields.append(_elem717) else: while iprot.peekList(): - _elem668 = iprot.readString() - self.fields.append(_elem668) + _elem718 = iprot.readString() + self.fields.append(_elem718) iprot.readListEnd() else: iprot.skip(ftype) @@ -14981,8 +15327,8 @@ def write(self, oprot): if self.fields != None: oprot.writeFieldBegin('fields', TType.LIST, 3) oprot.writeListBegin(TType.STRING, len(self.fields)) - for iter669 in self.fields: - oprot.writeString(iter669) + for iter719 in self.fields: + oprot.writeString(iter719) oprot.writeListEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -15286,19 +15632,19 @@ def read(self, iprot): elif fid == 3: if ftype == TType.MAP: self.indexes = {} - (_ktype671, _vtype672, _size670 ) = iprot.readMapBegin() - if _size670 >= 0: - for _i674 in range(_size670): - _key675 = iprot.readString() - _val676 = FTIndex() - _val676.read(iprot) - self.indexes[_key675] = _val676 + (_ktype721, _vtype722, _size720 ) = iprot.readMapBegin() + if _size720 >= 0: + for _i724 in range(_size720): + _key725 = iprot.readString() + _val726 = FTIndex() + _val726.read(iprot) + self.indexes[_key725] = _val726 else: while iprot.peekMap(): - _key677 = iprot.readString() - _val678 = FTIndex() - _val678.read(iprot) - self.indexes[_key677] = _val678 + _key727 = iprot.readString() + _val728 = FTIndex() + _val728.read(iprot) + self.indexes[_key727] = _val728 iprot.readMapEnd() else: iprot.skip(ftype) @@ -15326,9 +15672,9 @@ def write(self, oprot): if self.indexes != None: oprot.writeFieldBegin('indexes', TType.MAP, 3) oprot.writeMapBegin(TType.STRING, TType.STRUCT, len(self.indexes)) - for kiter679,viter680 in self.indexes.items(): - oprot.writeString(kiter679) - viter680.write(oprot) + for kiter729,viter730 in self.indexes.items(): + oprot.writeString(kiter729) + viter730.write(oprot) oprot.writeMapEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -15571,38 +15917,38 @@ def read(self, iprot): elif fid == 9: if ftype == TType.MAP: self.configs = {} - (_ktype682, _vtype683, _size681 ) = iprot.readMapBegin() - if _size681 >= 0: - for _i685 in range(_size681): - _key686 = iprot.readString() - _val687 = nebula3.common.ttypes.Value() - _val687.read(iprot) - self.configs[_key686] = _val687 + (_ktype732, _vtype733, _size731 ) = iprot.readMapBegin() + if _size731 >= 0: + for _i735 in range(_size731): + _key736 = iprot.readString() + _val737 = nebula3.common.ttypes.Value() + _val737.read(iprot) + self.configs[_key736] = _val737 else: while iprot.peekMap(): - _key688 = iprot.readString() - _val689 = nebula3.common.ttypes.Value() - _val689.read(iprot) - self.configs[_key688] = _val689 + _key738 = iprot.readString() + _val739 = nebula3.common.ttypes.Value() + _val739.read(iprot) + self.configs[_key738] = _val739 iprot.readMapEnd() else: iprot.skip(ftype) elif fid == 10: if ftype == TType.MAP: self.queries = {} - (_ktype691, _vtype692, _size690 ) = iprot.readMapBegin() - if _size690 >= 0: - for _i694 in range(_size690): - _key695 = iprot.readI64() - _val696 = QueryDesc() - _val696.read(iprot) - self.queries[_key695] = _val696 + (_ktype741, _vtype742, _size740 ) = iprot.readMapBegin() + if _size740 >= 0: + for _i744 in range(_size740): + _key745 = iprot.readI64() + _val746 = QueryDesc() + _val746.read(iprot) + self.queries[_key745] = _val746 else: while iprot.peekMap(): - _key697 = iprot.readI64() - _val698 = QueryDesc() - _val698.read(iprot) - self.queries[_key697] = _val698 + _key747 = iprot.readI64() + _val748 = QueryDesc() + _val748.read(iprot) + self.queries[_key747] = _val748 iprot.readMapEnd() else: iprot.skip(ftype) @@ -15654,17 +16000,17 @@ def write(self, oprot): if self.configs != None: oprot.writeFieldBegin('configs', TType.MAP, 9) oprot.writeMapBegin(TType.STRING, TType.STRUCT, len(self.configs)) - for kiter699,viter700 in self.configs.items(): - oprot.writeString(kiter699) - viter700.write(oprot) + for kiter749,viter750 in self.configs.items(): + oprot.writeString(kiter749) + viter750.write(oprot) oprot.writeMapEnd() oprot.writeFieldEnd() if self.queries != None: oprot.writeFieldBegin('queries', TType.MAP, 10) oprot.writeMapBegin(TType.I64, TType.STRUCT, len(self.queries)) - for kiter701,viter702 in self.queries.items(): - oprot.writeI64(kiter701) - viter702.write(oprot) + for kiter751,viter752 in self.queries.items(): + oprot.writeI64(kiter751) + viter752.write(oprot) oprot.writeMapEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -15959,17 +16305,17 @@ def read(self, iprot): if fid == 1: if ftype == TType.LIST: self.sessions = [] - (_etype706, _size703) = iprot.readListBegin() - if _size703 >= 0: - for _i707 in range(_size703): - _elem708 = Session() - _elem708.read(iprot) - self.sessions.append(_elem708) + (_etype756, _size753) = iprot.readListBegin() + if _size753 >= 0: + for _i757 in range(_size753): + _elem758 = Session() + _elem758.read(iprot) + self.sessions.append(_elem758) else: while iprot.peekList(): - _elem709 = Session() - _elem709.read(iprot) - self.sessions.append(_elem709) + _elem759 = Session() + _elem759.read(iprot) + self.sessions.append(_elem759) iprot.readListEnd() else: iprot.skip(ftype) @@ -15989,8 +16335,8 @@ def write(self, oprot): if self.sessions != None: oprot.writeFieldBegin('sessions', TType.LIST, 1) oprot.writeListBegin(TType.STRUCT, len(self.sessions)) - for iter710 in self.sessions: - iter710.write(oprot) + for iter760 in self.sessions: + iter760.write(oprot) oprot.writeListEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -16023,6 +16369,7 @@ class UpdateSessionsResp: - code - leader - killed_queries + - killed_sessions """ thrift_spec = None @@ -16059,48 +16406,63 @@ def read(self, iprot): elif fid == 3: if ftype == TType.MAP: self.killed_queries = {} - (_ktype712, _vtype713, _size711 ) = iprot.readMapBegin() - if _size711 >= 0: - for _i715 in range(_size711): - _key716 = iprot.readI64() - _val717 = {} - (_ktype719, _vtype720, _size718 ) = iprot.readMapBegin() - if _size718 >= 0: - for _i722 in range(_size718): - _key723 = iprot.readI64() - _val724 = QueryDesc() - _val724.read(iprot) - _val717[_key723] = _val724 + (_ktype762, _vtype763, _size761 ) = iprot.readMapBegin() + if _size761 >= 0: + for _i765 in range(_size761): + _key766 = iprot.readI64() + _val767 = {} + (_ktype769, _vtype770, _size768 ) = iprot.readMapBegin() + if _size768 >= 0: + for _i772 in range(_size768): + _key773 = iprot.readI64() + _val774 = QueryDesc() + _val774.read(iprot) + _val767[_key773] = _val774 else: while iprot.peekMap(): - _key725 = iprot.readI64() - _val726 = QueryDesc() - _val726.read(iprot) - _val717[_key725] = _val726 + _key775 = iprot.readI64() + _val776 = QueryDesc() + _val776.read(iprot) + _val767[_key775] = _val776 iprot.readMapEnd() - self.killed_queries[_key716] = _val717 + self.killed_queries[_key766] = _val767 else: while iprot.peekMap(): - _key727 = iprot.readI64() - _val728 = {} - (_ktype730, _vtype731, _size729 ) = iprot.readMapBegin() - if _size729 >= 0: - for _i733 in range(_size729): - _key734 = iprot.readI64() - _val735 = QueryDesc() - _val735.read(iprot) - _val728[_key734] = _val735 + _key777 = iprot.readI64() + _val778 = {} + (_ktype780, _vtype781, _size779 ) = iprot.readMapBegin() + if _size779 >= 0: + for _i783 in range(_size779): + _key784 = iprot.readI64() + _val785 = QueryDesc() + _val785.read(iprot) + _val778[_key784] = _val785 else: while iprot.peekMap(): - _key736 = iprot.readI64() - _val737 = QueryDesc() - _val737.read(iprot) - _val728[_key736] = _val737 + _key786 = iprot.readI64() + _val787 = QueryDesc() + _val787.read(iprot) + _val778[_key786] = _val787 iprot.readMapEnd() - self.killed_queries[_key727] = _val728 + self.killed_queries[_key777] = _val778 iprot.readMapEnd() else: iprot.skip(ftype) + elif fid == 4: + if ftype == TType.LIST: + self.killed_sessions = [] + (_etype791, _size788) = iprot.readListBegin() + if _size788 >= 0: + for _i792 in range(_size788): + _elem793 = iprot.readI64() + self.killed_sessions.append(_elem793) + else: + while iprot.peekList(): + _elem794 = iprot.readI64() + self.killed_sessions.append(_elem794) + iprot.readListEnd() + else: + iprot.skip(ftype) else: iprot.skip(ftype) iprot.readFieldEnd() @@ -16125,15 +16487,22 @@ def write(self, oprot): if self.killed_queries != None: oprot.writeFieldBegin('killed_queries', TType.MAP, 3) oprot.writeMapBegin(TType.I64, TType.MAP, len(self.killed_queries)) - for kiter738,viter739 in self.killed_queries.items(): - oprot.writeI64(kiter738) - oprot.writeMapBegin(TType.I64, TType.STRUCT, len(viter739)) - for kiter740,viter741 in viter739.items(): - oprot.writeI64(kiter740) - viter741.write(oprot) + for kiter795,viter796 in self.killed_queries.items(): + oprot.writeI64(kiter795) + oprot.writeMapBegin(TType.I64, TType.STRUCT, len(viter796)) + for kiter797,viter798 in viter796.items(): + oprot.writeI64(kiter797) + viter798.write(oprot) oprot.writeMapEnd() oprot.writeMapEnd() oprot.writeFieldEnd() + if self.killed_sessions != None: + oprot.writeFieldBegin('killed_sessions', TType.LIST, 4) + oprot.writeListBegin(TType.I64, len(self.killed_sessions)) + for iter799 in self.killed_sessions: + oprot.writeI64(iter799) + oprot.writeListEnd() + oprot.writeFieldEnd() oprot.writeFieldStop() oprot.writeStructEnd() @@ -16152,6 +16521,10 @@ def __repr__(self): value = pprint.pformat(self.killed_queries, indent=0) value = padding.join(value.splitlines(True)) L.append(' killed_queries=%s' % (value)) + if self.killed_sessions is not None: + value = pprint.pformat(self.killed_sessions, indent=0) + value = padding.join(value.splitlines(True)) + L.append(' killed_sessions=%s' % (value)) return "%s(%s)" % (self.__class__.__name__, "\n" + ",\n".join(L) if L else '') def __eq__(self, other): @@ -16262,17 +16635,17 @@ def read(self, iprot): elif fid == 3: if ftype == TType.LIST: self.sessions = [] - (_etype745, _size742) = iprot.readListBegin() - if _size742 >= 0: - for _i746 in range(_size742): - _elem747 = Session() - _elem747.read(iprot) - self.sessions.append(_elem747) + (_etype803, _size800) = iprot.readListBegin() + if _size800 >= 0: + for _i804 in range(_size800): + _elem805 = Session() + _elem805.read(iprot) + self.sessions.append(_elem805) else: while iprot.peekList(): - _elem748 = Session() - _elem748.read(iprot) - self.sessions.append(_elem748) + _elem806 = Session() + _elem806.read(iprot) + self.sessions.append(_elem806) iprot.readListEnd() else: iprot.skip(ftype) @@ -16300,8 +16673,8 @@ def write(self, oprot): if self.sessions != None: oprot.writeFieldBegin('sessions', TType.LIST, 3) oprot.writeListBegin(TType.STRUCT, len(self.sessions)) - for iter749 in self.sessions: - iter749.write(oprot) + for iter807 in self.sessions: + iter807.write(oprot) oprot.writeListEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -16513,7 +16886,7 @@ def __ne__(self, other): class RemoveSessionReq: """ Attributes: - - session_id + - session_ids """ thrift_spec = None @@ -16537,8 +16910,18 @@ def read(self, iprot): if ftype == TType.STOP: break if fid == 1: - if ftype == TType.I64: - self.session_id = iprot.readI64() + if ftype == TType.LIST: + self.session_ids = [] + (_etype811, _size808) = iprot.readListBegin() + if _size808 >= 0: + for _i812 in range(_size808): + _elem813 = iprot.readI64() + self.session_ids.append(_elem813) + else: + while iprot.peekList(): + _elem814 = iprot.readI64() + self.session_ids.append(_elem814) + iprot.readListEnd() else: iprot.skip(ftype) else: @@ -16554,9 +16937,12 @@ def write(self, oprot): oprot.trans.write(fastproto.encode(self, [self.__class__, self.thrift_spec, False], utf8strings=UTF8STRINGS, protoid=2)) return oprot.writeStructBegin('RemoveSessionReq') - if self.session_id != None: - oprot.writeFieldBegin('session_id', TType.I64, 1) - oprot.writeI64(self.session_id) + if self.session_ids != None: + oprot.writeFieldBegin('session_ids', TType.LIST, 1) + oprot.writeListBegin(TType.I64, len(self.session_ids)) + for iter815 in self.session_ids: + oprot.writeI64(iter815) + oprot.writeListEnd() oprot.writeFieldEnd() oprot.writeFieldStop() oprot.writeStructEnd() @@ -16564,10 +16950,124 @@ def write(self, oprot): def __repr__(self): L = [] padding = ' ' * 4 - if self.session_id is not None: - value = pprint.pformat(self.session_id, indent=0) + if self.session_ids is not None: + value = pprint.pformat(self.session_ids, indent=0) value = padding.join(value.splitlines(True)) - L.append(' session_id=%s' % (value)) + L.append(' session_ids=%s' % (value)) + return "%s(%s)" % (self.__class__.__name__, "\n" + ",\n".join(L) if L else '') + + def __eq__(self, other): + if not isinstance(other, self.__class__): + return False + + return self.__dict__ == other.__dict__ + + def __ne__(self, other): + return not (self == other) + + # Override the __hash__ function for Python3 - t10434117 + __hash__ = object.__hash__ + +class RemoveSessionResp: + """ + Attributes: + - code + - leader + - removed_session_ids + """ + + thrift_spec = None + thrift_field_annotations = None + thrift_struct_annotations = None + __init__ = None + @staticmethod + def isUnion(): + return False + + def read(self, iprot): + if (isinstance(iprot, TBinaryProtocol.TBinaryProtocolAccelerated) or (isinstance(iprot, THeaderProtocol.THeaderProtocolAccelerate) and iprot.get_protocol_id() == THeaderProtocol.THeaderProtocol.T_BINARY_PROTOCOL)) and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastproto is not None: + fastproto.decode(self, iprot.trans, [self.__class__, self.thrift_spec, False], utf8strings=UTF8STRINGS, protoid=0) + return + if (isinstance(iprot, TCompactProtocol.TCompactProtocolAccelerated) or (isinstance(iprot, THeaderProtocol.THeaderProtocolAccelerate) and iprot.get_protocol_id() == THeaderProtocol.THeaderProtocol.T_COMPACT_PROTOCOL)) and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastproto is not None: + fastproto.decode(self, iprot.trans, [self.__class__, self.thrift_spec, False], utf8strings=UTF8STRINGS, protoid=2) + return + iprot.readStructBegin() + while True: + (fname, ftype, fid) = iprot.readFieldBegin() + if ftype == TType.STOP: + break + if fid == 1: + if ftype == TType.I32: + self.code = iprot.readI32() + else: + iprot.skip(ftype) + elif fid == 2: + if ftype == TType.STRUCT: + self.leader = nebula3.common.ttypes.HostAddr() + self.leader.read(iprot) + else: + iprot.skip(ftype) + elif fid == 3: + if ftype == TType.LIST: + self.removed_session_ids = [] + (_etype819, _size816) = iprot.readListBegin() + if _size816 >= 0: + for _i820 in range(_size816): + _elem821 = iprot.readI64() + self.removed_session_ids.append(_elem821) + else: + while iprot.peekList(): + _elem822 = iprot.readI64() + self.removed_session_ids.append(_elem822) + iprot.readListEnd() + else: + iprot.skip(ftype) + else: + iprot.skip(ftype) + iprot.readFieldEnd() + iprot.readStructEnd() + + def write(self, oprot): + if (isinstance(oprot, TBinaryProtocol.TBinaryProtocolAccelerated) or (isinstance(oprot, THeaderProtocol.THeaderProtocolAccelerate) and oprot.get_protocol_id() == THeaderProtocol.THeaderProtocol.T_BINARY_PROTOCOL)) and self.thrift_spec is not None and fastproto is not None: + oprot.trans.write(fastproto.encode(self, [self.__class__, self.thrift_spec, False], utf8strings=UTF8STRINGS, protoid=0)) + return + if (isinstance(oprot, TCompactProtocol.TCompactProtocolAccelerated) or (isinstance(oprot, THeaderProtocol.THeaderProtocolAccelerate) and oprot.get_protocol_id() == THeaderProtocol.THeaderProtocol.T_COMPACT_PROTOCOL)) and self.thrift_spec is not None and fastproto is not None: + oprot.trans.write(fastproto.encode(self, [self.__class__, self.thrift_spec, False], utf8strings=UTF8STRINGS, protoid=2)) + return + oprot.writeStructBegin('RemoveSessionResp') + if self.code != None: + oprot.writeFieldBegin('code', TType.I32, 1) + oprot.writeI32(self.code) + oprot.writeFieldEnd() + if self.leader != None: + oprot.writeFieldBegin('leader', TType.STRUCT, 2) + self.leader.write(oprot) + oprot.writeFieldEnd() + if self.removed_session_ids != None: + oprot.writeFieldBegin('removed_session_ids', TType.LIST, 3) + oprot.writeListBegin(TType.I64, len(self.removed_session_ids)) + for iter823 in self.removed_session_ids: + oprot.writeI64(iter823) + oprot.writeListEnd() + oprot.writeFieldEnd() + oprot.writeFieldStop() + oprot.writeStructEnd() + + def __repr__(self): + L = [] + padding = ' ' * 4 + if self.code is not None: + value = pprint.pformat(self.code, indent=0) + value = padding.join(value.splitlines(True)) + L.append(' code=%s' % (value)) + if self.leader is not None: + value = pprint.pformat(self.leader, indent=0) + value = padding.join(value.splitlines(True)) + L.append(' leader=%s' % (value)) + if self.removed_session_ids is not None: + value = pprint.pformat(self.removed_session_ids, indent=0) + value = padding.join(value.splitlines(True)) + L.append(' removed_session_ids=%s' % (value)) return "%s(%s)" % (self.__class__.__name__, "\n" + ",\n".join(L) if L else '') def __eq__(self, other): @@ -16611,37 +17111,37 @@ def read(self, iprot): if fid == 1: if ftype == TType.MAP: self.kill_queries = {} - (_ktype751, _vtype752, _size750 ) = iprot.readMapBegin() - if _size750 >= 0: - for _i754 in range(_size750): - _key755 = iprot.readI64() - _val756 = set() - (_etype760, _size757) = iprot.readSetBegin() - if _size757 >= 0: - for _i761 in range(_size757): - _elem762 = iprot.readI64() - _val756.add(_elem762) + (_ktype825, _vtype826, _size824 ) = iprot.readMapBegin() + if _size824 >= 0: + for _i828 in range(_size824): + _key829 = iprot.readI64() + _val830 = set() + (_etype834, _size831) = iprot.readSetBegin() + if _size831 >= 0: + for _i835 in range(_size831): + _elem836 = iprot.readI64() + _val830.add(_elem836) else: while iprot.peekSet(): - _elem763 = iprot.readI64() - _val756.add(_elem763) + _elem837 = iprot.readI64() + _val830.add(_elem837) iprot.readSetEnd() - self.kill_queries[_key755] = _val756 + self.kill_queries[_key829] = _val830 else: while iprot.peekMap(): - _key764 = iprot.readI64() - _val765 = set() - (_etype769, _size766) = iprot.readSetBegin() - if _size766 >= 0: - for _i770 in range(_size766): - _elem771 = iprot.readI64() - _val765.add(_elem771) + _key838 = iprot.readI64() + _val839 = set() + (_etype843, _size840) = iprot.readSetBegin() + if _size840 >= 0: + for _i844 in range(_size840): + _elem845 = iprot.readI64() + _val839.add(_elem845) else: while iprot.peekSet(): - _elem772 = iprot.readI64() - _val765.add(_elem772) + _elem846 = iprot.readI64() + _val839.add(_elem846) iprot.readSetEnd() - self.kill_queries[_key764] = _val765 + self.kill_queries[_key838] = _val839 iprot.readMapEnd() else: iprot.skip(ftype) @@ -16661,11 +17161,11 @@ def write(self, oprot): if self.kill_queries != None: oprot.writeFieldBegin('kill_queries', TType.MAP, 1) oprot.writeMapBegin(TType.I64, TType.SET, len(self.kill_queries)) - for kiter773,viter774 in self.kill_queries.items(): - oprot.writeI64(kiter773) - oprot.writeSetBegin(TType.I64, len(viter774)) - for iter775 in viter774: - oprot.writeI64(iter775) + for kiter847,viter848 in self.kill_queries.items(): + oprot.writeI64(kiter847) + oprot.writeSetBegin(TType.I64, len(viter848)) + for iter849 in viter848: + oprot.writeI64(iter849) oprot.writeSetEnd() oprot.writeMapEnd() oprot.writeFieldEnd() @@ -16864,41 +17364,41 @@ def read(self, iprot): elif fid == 3: if ftype == TType.MAP: self.host_services = {} - (_ktype777, _vtype778, _size776 ) = iprot.readMapBegin() - if _size776 >= 0: - for _i780 in range(_size776): - _key781 = iprot.readString().decode('utf-8') if UTF8STRINGS else iprot.readString() - _val782 = [] - (_etype786, _size783) = iprot.readListBegin() - if _size783 >= 0: - for _i787 in range(_size783): - _elem788 = ServiceInfo() - _elem788.read(iprot) - _val782.append(_elem788) + (_ktype851, _vtype852, _size850 ) = iprot.readMapBegin() + if _size850 >= 0: + for _i854 in range(_size850): + _key855 = iprot.readString().decode('utf-8') if UTF8STRINGS else iprot.readString() + _val856 = [] + (_etype860, _size857) = iprot.readListBegin() + if _size857 >= 0: + for _i861 in range(_size857): + _elem862 = ServiceInfo() + _elem862.read(iprot) + _val856.append(_elem862) else: while iprot.peekList(): - _elem789 = ServiceInfo() - _elem789.read(iprot) - _val782.append(_elem789) + _elem863 = ServiceInfo() + _elem863.read(iprot) + _val856.append(_elem863) iprot.readListEnd() - self.host_services[_key781] = _val782 + self.host_services[_key855] = _val856 else: while iprot.peekMap(): - _key790 = iprot.readString().decode('utf-8') if UTF8STRINGS else iprot.readString() - _val791 = [] - (_etype795, _size792) = iprot.readListBegin() - if _size792 >= 0: - for _i796 in range(_size792): - _elem797 = ServiceInfo() - _elem797.read(iprot) - _val791.append(_elem797) + _key864 = iprot.readString().decode('utf-8') if UTF8STRINGS else iprot.readString() + _val865 = [] + (_etype869, _size866) = iprot.readListBegin() + if _size866 >= 0: + for _i870 in range(_size866): + _elem871 = ServiceInfo() + _elem871.read(iprot) + _val865.append(_elem871) else: while iprot.peekList(): - _elem798 = ServiceInfo() - _elem798.read(iprot) - _val791.append(_elem798) + _elem872 = ServiceInfo() + _elem872.read(iprot) + _val865.append(_elem872) iprot.readListEnd() - self.host_services[_key790] = _val791 + self.host_services[_key864] = _val865 iprot.readMapEnd() else: iprot.skip(ftype) @@ -16926,11 +17426,11 @@ def write(self, oprot): if self.host_services != None: oprot.writeFieldBegin('host_services', TType.MAP, 3) oprot.writeMapBegin(TType.STRING, TType.LIST, len(self.host_services)) - for kiter799,viter800 in self.host_services.items(): - oprot.writeString(kiter799.encode('utf-8')) if UTF8STRINGS and not isinstance(kiter799, bytes) else oprot.writeString(kiter799) - oprot.writeListBegin(TType.STRUCT, len(viter800)) - for iter801 in viter800: - iter801.write(oprot) + for kiter873,viter874 in self.host_services.items(): + oprot.writeString(kiter873.encode('utf-8')) if UTF8STRINGS and not isinstance(kiter873, bytes) else oprot.writeString(kiter873) + oprot.writeListBegin(TType.STRUCT, len(viter874)) + for iter875 in viter874: + iter875.write(oprot) oprot.writeListEnd() oprot.writeMapEnd() oprot.writeFieldEnd() @@ -20477,7 +20977,7 @@ def ListConfigsResp__setstate__(self, state): all_structs.append(DropSnapshotReq) DropSnapshotReq.thrift_spec = ( None, # 0 - (1, TType.STRING, 'name', False, None, 2, ), # 1 + (1, TType.LIST, 'names', (TType.STRING,False), None, 2, ), # 1 ) DropSnapshotReq.thrift_struct_annotations = { @@ -20485,13 +20985,13 @@ def ListConfigsResp__setstate__(self, state): DropSnapshotReq.thrift_field_annotations = { } -def DropSnapshotReq__init__(self, name=None,): - self.name = name +def DropSnapshotReq__init__(self, names=None,): + self.names = names DropSnapshotReq.__init__ = DropSnapshotReq__init__ def DropSnapshotReq__setstate__(self, state): - state.setdefault('name', None) + state.setdefault('names', None) self.__dict__ = state DropSnapshotReq.__getstate__ = lambda self: self.__dict__.copy() @@ -21140,6 +21640,9 @@ def SpaceBackupInfo__setstate__(self, state): (4, TType.BOOL, 'full', None, None, 2, ), # 4 (5, TType.BOOL, 'all_spaces', None, None, 2, ), # 5 (6, TType.I64, 'create_time', None, None, 2, ), # 6 + (7, TType.STRING, 'base_backup_name', False, None, 2, ), # 7 + (8, TType.LIST, 'storage_hosts', (TType.STRUCT,[nebula3.common.ttypes.HostAddr, nebula3.common.ttypes.HostAddr.thrift_spec, False]), None, 2, ), # 8 + (9, TType.I64, 'cluster_id', None, None, 2, ), # 9 ) BackupMeta.thrift_struct_annotations = { @@ -21147,13 +21650,16 @@ def SpaceBackupInfo__setstate__(self, state): BackupMeta.thrift_field_annotations = { } -def BackupMeta__init__(self, space_backups=None, meta_files=None, backup_name=None, full=None, all_spaces=None, create_time=None,): +def BackupMeta__init__(self, space_backups=None, meta_files=None, backup_name=None, full=None, all_spaces=None, create_time=None, base_backup_name=None, storage_hosts=None, cluster_id=None,): self.space_backups = space_backups self.meta_files = meta_files self.backup_name = backup_name self.full = full self.all_spaces = all_spaces self.create_time = create_time + self.base_backup_name = base_backup_name + self.storage_hosts = storage_hosts + self.cluster_id = cluster_id BackupMeta.__init__ = BackupMeta__init__ @@ -21164,6 +21670,9 @@ def BackupMeta__setstate__(self, state): state.setdefault('full', None) state.setdefault('all_spaces', None) state.setdefault('create_time', None) + state.setdefault('base_backup_name', None) + state.setdefault('storage_hosts', None) + state.setdefault('cluster_id', None) self.__dict__ = state BackupMeta.__getstate__ = lambda self: self.__dict__.copy() @@ -21173,6 +21682,8 @@ def BackupMeta__setstate__(self, state): CreateBackupReq.thrift_spec = ( None, # 0 (1, TType.LIST, 'spaces', (TType.STRING,False), None, 1, ), # 1 + (2, TType.STRING, 'base_backup_name', False, None, 1, ), # 2 + (3, TType.I64, 'cluster_id', None, None, 1, ), # 3 ) CreateBackupReq.thrift_struct_annotations = { @@ -21180,13 +21691,17 @@ def BackupMeta__setstate__(self, state): CreateBackupReq.thrift_field_annotations = { } -def CreateBackupReq__init__(self, spaces=None,): +def CreateBackupReq__init__(self, spaces=None, base_backup_name=None, cluster_id=None,): self.spaces = spaces + self.base_backup_name = base_backup_name + self.cluster_id = cluster_id CreateBackupReq.__init__ = CreateBackupReq__init__ def CreateBackupReq__setstate__(self, state): state.setdefault('spaces', None) + state.setdefault('base_backup_name', None) + state.setdefault('cluster_id', None) self.__dict__ = state CreateBackupReq.__getstate__ = lambda self: self.__dict__.copy() @@ -21273,6 +21788,61 @@ def RestoreMetaReq__setstate__(self, state): RestoreMetaReq.__getstate__ = lambda self: self.__dict__.copy() RestoreMetaReq.__setstate__ = RestoreMetaReq__setstate__ +all_structs.append(PartInfo) +PartInfo.thrift_spec = ( + None, # 0 + (1, TType.I32, 'part_id', None, None, 2, ), # 1 + (2, TType.LIST, 'hosts', (TType.STRUCT,[nebula3.common.ttypes.HostAddr, nebula3.common.ttypes.HostAddr.thrift_spec, False]), None, 2, ), # 2 +) + +PartInfo.thrift_struct_annotations = { +} +PartInfo.thrift_field_annotations = { +} + +def PartInfo__init__(self, part_id=None, hosts=None,): + self.part_id = part_id + self.hosts = hosts + +PartInfo.__init__ = PartInfo__init__ + +def PartInfo__setstate__(self, state): + state.setdefault('part_id', None) + state.setdefault('hosts', None) + self.__dict__ = state + +PartInfo.__getstate__ = lambda self: self.__dict__.copy() +PartInfo.__setstate__ = PartInfo__setstate__ + +all_structs.append(RestoreMetaResp) +RestoreMetaResp.thrift_spec = ( + None, # 0 + (1, TType.I32, 'code', nebula3.common.ttypes.ErrorCode, None, 2, ), # 1 + (2, TType.STRUCT, 'leader', [nebula3.common.ttypes.HostAddr, nebula3.common.ttypes.HostAddr.thrift_spec, False], None, 2, ), # 2 + (3, TType.MAP, 'part_hosts', (TType.I32,None,TType.LIST,(TType.STRUCT,[PartInfo, PartInfo.thrift_spec, False])), None, 2, ), # 3 +) + +RestoreMetaResp.thrift_struct_annotations = { +} +RestoreMetaResp.thrift_field_annotations = { +} + +def RestoreMetaResp__init__(self, code=None, leader=None, part_hosts=None,): + self.code = code + self.leader = leader + self.part_hosts = part_hosts + +RestoreMetaResp.__init__ = RestoreMetaResp__init__ + +def RestoreMetaResp__setstate__(self, state): + state.setdefault('code', None) + state.setdefault('leader', None) + state.setdefault('part_hosts', None) + self.__dict__ = state + +RestoreMetaResp.__getstate__ = lambda self: self.__dict__.copy() +RestoreMetaResp.__setstate__ = RestoreMetaResp__setstate__ + all_structs.append(ServiceClient) ServiceClient.thrift_spec = ( None, # 0 @@ -21697,6 +22267,7 @@ def UpdateSessionsReq__setstate__(self, state): (1, TType.I32, 'code', nebula3.common.ttypes.ErrorCode, None, 2, ), # 1 (2, TType.STRUCT, 'leader', [nebula3.common.ttypes.HostAddr, nebula3.common.ttypes.HostAddr.thrift_spec, False], None, 2, ), # 2 (3, TType.MAP, 'killed_queries', (TType.I64,None,TType.MAP,(TType.I64,None,TType.STRUCT,[QueryDesc, QueryDesc.thrift_spec, False])), None, 2, ), # 3 + (4, TType.LIST, 'killed_sessions', (TType.I64,None), None, 2, ), # 4 ) UpdateSessionsResp.thrift_struct_annotations = { @@ -21704,10 +22275,11 @@ def UpdateSessionsReq__setstate__(self, state): UpdateSessionsResp.thrift_field_annotations = { } -def UpdateSessionsResp__init__(self, code=None, leader=None, killed_queries=None,): +def UpdateSessionsResp__init__(self, code=None, leader=None, killed_queries=None, killed_sessions=None,): self.code = code self.leader = leader self.killed_queries = killed_queries + self.killed_sessions = killed_sessions UpdateSessionsResp.__init__ = UpdateSessionsResp__init__ @@ -21715,6 +22287,7 @@ def UpdateSessionsResp__setstate__(self, state): state.setdefault('code', None) state.setdefault('leader', None) state.setdefault('killed_queries', None) + state.setdefault('killed_sessions', None) self.__dict__ = state UpdateSessionsResp.__getstate__ = lambda self: self.__dict__.copy() @@ -21813,7 +22386,7 @@ def GetSessionResp__setstate__(self, state): all_structs.append(RemoveSessionReq) RemoveSessionReq.thrift_spec = ( None, # 0 - (1, TType.I64, 'session_id', None, None, 2, ), # 1 + (1, TType.LIST, 'session_ids', (TType.I64,None), None, 2, ), # 1 ) RemoveSessionReq.thrift_struct_annotations = { @@ -21821,18 +22394,47 @@ def GetSessionResp__setstate__(self, state): RemoveSessionReq.thrift_field_annotations = { } -def RemoveSessionReq__init__(self, session_id=None,): - self.session_id = session_id +def RemoveSessionReq__init__(self, session_ids=None,): + self.session_ids = session_ids RemoveSessionReq.__init__ = RemoveSessionReq__init__ def RemoveSessionReq__setstate__(self, state): - state.setdefault('session_id', None) + state.setdefault('session_ids', None) self.__dict__ = state RemoveSessionReq.__getstate__ = lambda self: self.__dict__.copy() RemoveSessionReq.__setstate__ = RemoveSessionReq__setstate__ +all_structs.append(RemoveSessionResp) +RemoveSessionResp.thrift_spec = ( + None, # 0 + (1, TType.I32, 'code', nebula3.common.ttypes.ErrorCode, None, 2, ), # 1 + (2, TType.STRUCT, 'leader', [nebula3.common.ttypes.HostAddr, nebula3.common.ttypes.HostAddr.thrift_spec, False], None, 2, ), # 2 + (3, TType.LIST, 'removed_session_ids', (TType.I64,None), None, 2, ), # 3 +) + +RemoveSessionResp.thrift_struct_annotations = { +} +RemoveSessionResp.thrift_field_annotations = { +} + +def RemoveSessionResp__init__(self, code=None, leader=None, removed_session_ids=None,): + self.code = code + self.leader = leader + self.removed_session_ids = removed_session_ids + +RemoveSessionResp.__init__ = RemoveSessionResp__init__ + +def RemoveSessionResp__setstate__(self, state): + state.setdefault('code', None) + state.setdefault('leader', None) + state.setdefault('removed_session_ids', None) + self.__dict__ = state + +RemoveSessionResp.__getstate__ = lambda self: self.__dict__.copy() +RemoveSessionResp.__setstate__ = RemoveSessionResp__setstate__ + all_structs.append(KillQueryReq) KillQueryReq.thrift_spec = ( None, # 0 diff --git a/nebula3/storage/GraphStorageService-fuzzer b/nebula3/storage/GraphStorageService-fuzzer old mode 100755 new mode 100644 diff --git a/nebula3/storage/GraphStorageService-remote b/nebula3/storage/GraphStorageService-remote old mode 100755 new mode 100644 index 60d0f6da..2d45e642 --- a/nebula3/storage/GraphStorageService-remote +++ b/nebula3/storage/GraphStorageService-remote @@ -43,6 +43,7 @@ from nebula3.fbthrift.remote import Remote FUNCTIONS = { 'getNeighbors': Function('getNeighbors', 'GraphStorageService', 'GetNeighborsResponse', [('GetNeighborsRequest', 'req', 'GetNeighborsRequest')]), + 'getDstBySrc': Function('getDstBySrc', 'GraphStorageService', 'GetDstBySrcResponse', [('GetDstBySrcRequest', 'req', 'GetDstBySrcRequest')]), 'getProps': Function('getProps', 'GraphStorageService', 'GetPropResponse', [('GetPropRequest', 'req', 'GetPropRequest')]), 'addVertices': Function('addVertices', 'GraphStorageService', 'ExecResponse', [('AddVerticesRequest', 'req', 'AddVerticesRequest')]), 'addEdges': Function('addEdges', 'GraphStorageService', 'ExecResponse', [('AddEdgesRequest', 'req', 'AddEdgesRequest')]), diff --git a/nebula3/storage/GraphStorageService.py b/nebula3/storage/GraphStorageService.py index 36da314a..a818c6a3 100644 --- a/nebula3/storage/GraphStorageService.py +++ b/nebula3/storage/GraphStorageService.py @@ -12,7 +12,7 @@ from nebula3.fbthrift.protocol.TProtocol import TProtocolException -from .ttypes import UTF8STRINGS, StatType, OrderDirection, EdgeDirection, ScanType, EngineSignType, RequestCommon, PartitionResult, ResponseCommon, StatProp, Expr, EdgeProp, VertexProp, OrderBy, TraverseSpec, GetNeighborsRequest, GetNeighborsResponse, ExecResponse, GetPropRequest, GetPropResponse, NewTag, NewVertex, EdgeKey, NewEdge, AddVerticesRequest, AddEdgesRequest, DeleteVerticesRequest, DeleteEdgesRequest, DelTags, DeleteTagsRequest, UpdateResponse, UpdatedProp, UpdateVertexRequest, UpdateEdgeRequest, GetUUIDReq, GetUUIDResp, LookupIndexResp, IndexColumnHint, IndexQueryContext, IndexSpec, LookupIndexRequest, LookupAndTraverseRequest, ScanCursor, ScanVertexRequest, ScanEdgeRequest, ScanResponse, TaskPara, KVGetRequest, KVGetResponse, KVPutRequest, KVRemoveRequest, AdminExecResp, TransLeaderReq, AddPartReq, AddLearnerReq, RemovePartReq, MemberChangeReq, CatchUpDataReq, GetLeaderReq, CreateCPRequest, CreateCPResp, DropCPRequest, DropCPResp, BlockingSignRequest, BlockingSignResp, GetLeaderPartsResp, CheckPeersReq, RebuildIndexRequest, ListClusterInfoResp, ListClusterInfoReq, AddTaskRequest, AddTaskResp, StopTaskRequest, StopTaskResp, ClearSpaceReq, ClearSpaceResp, ChainAddEdgesRequest, ChainUpdateEdgeRequest, ChainDeleteEdgesRequest +from .ttypes import UTF8STRINGS, StatType, OrderDirection, EdgeDirection, ScanType, EngineSignType, RequestCommon, PartitionResult, ResponseCommon, StatProp, Expr, EdgeProp, VertexProp, OrderBy, TraverseSpec, GetNeighborsRequest, GetNeighborsResponse, GetDstBySrcRequest, GetDstBySrcResponse, ExecResponse, GetPropRequest, GetPropResponse, NewTag, NewVertex, EdgeKey, NewEdge, AddVerticesRequest, AddEdgesRequest, DeleteVerticesRequest, DeleteEdgesRequest, DelTags, DeleteTagsRequest, UpdateResponse, UpdatedProp, UpdateVertexRequest, UpdateEdgeRequest, GetUUIDReq, GetUUIDResp, LookupIndexResp, IndexColumnHint, IndexQueryContext, IndexSpec, LookupIndexRequest, LookupAndTraverseRequest, ScanCursor, ScanVertexRequest, ScanEdgeRequest, ScanResponse, TaskPara, KVGetRequest, KVGetResponse, KVPutRequest, KVRemoveRequest, AdminExecResp, TransLeaderReq, AddPartReq, AddLearnerReq, RemovePartReq, MemberChangeReq, CatchUpDataReq, GetLeaderReq, CreateCPRequest, CreateCPResp, DropCPRequest, DropCPResp, BlockingSignRequest, BlockingSignResp, GetLeaderPartsResp, CheckPeersReq, RebuildIndexRequest, ListClusterInfoResp, ListClusterInfoReq, AddTaskRequest, AddTaskResp, StopTaskRequest, StopTaskResp, ClearSpaceReq, ClearSpaceResp, ChainAddEdgesRequest, ChainUpdateEdgeRequest, ChainDeleteEdgesRequest import nebula3.common.ttypes import nebula3.meta.ttypes @@ -50,6 +50,13 @@ def getNeighbors(self, req=None): """ pass + def getDstBySrc(self, req=None): + """ + Parameters: + - req + """ + pass + def getProps(self, req=None): """ Parameters: @@ -192,6 +199,13 @@ def getNeighbors(self, handler_ctx, req=None): """ pass + def getDstBySrc(self, handler_ctx, req=None): + """ + Parameters: + - req + """ + pass + def getProps(self, handler_ctx, req=None): """ Parameters: @@ -519,6 +533,197 @@ def getNeighbors_result__setstate__(self, state): getNeighbors_result.__getstate__ = lambda self: self.__dict__.copy() getNeighbors_result.__setstate__ = getNeighbors_result__setstate__ +class getDstBySrc_args: + """ + Attributes: + - req + """ + + thrift_spec = None + thrift_field_annotations = None + thrift_struct_annotations = None + __init__ = None + @staticmethod + def isUnion(): + return False + + def read(self, iprot): + if (isinstance(iprot, TBinaryProtocol.TBinaryProtocolAccelerated) or (isinstance(iprot, THeaderProtocol.THeaderProtocolAccelerate) and iprot.get_protocol_id() == THeaderProtocol.THeaderProtocol.T_BINARY_PROTOCOL)) and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastproto is not None: + fastproto.decode(self, iprot.trans, [self.__class__, self.thrift_spec, False], utf8strings=UTF8STRINGS, protoid=0) + return + if (isinstance(iprot, TCompactProtocol.TCompactProtocolAccelerated) or (isinstance(iprot, THeaderProtocol.THeaderProtocolAccelerate) and iprot.get_protocol_id() == THeaderProtocol.THeaderProtocol.T_COMPACT_PROTOCOL)) and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastproto is not None: + fastproto.decode(self, iprot.trans, [self.__class__, self.thrift_spec, False], utf8strings=UTF8STRINGS, protoid=2) + return + iprot.readStructBegin() + while True: + (fname, ftype, fid) = iprot.readFieldBegin() + if ftype == TType.STOP: + break + if fid == 1: + if ftype == TType.STRUCT: + self.req = GetDstBySrcRequest() + self.req.read(iprot) + else: + iprot.skip(ftype) + else: + iprot.skip(ftype) + iprot.readFieldEnd() + iprot.readStructEnd() + + def write(self, oprot): + if (isinstance(oprot, TBinaryProtocol.TBinaryProtocolAccelerated) or (isinstance(oprot, THeaderProtocol.THeaderProtocolAccelerate) and oprot.get_protocol_id() == THeaderProtocol.THeaderProtocol.T_BINARY_PROTOCOL)) and self.thrift_spec is not None and fastproto is not None: + oprot.trans.write(fastproto.encode(self, [self.__class__, self.thrift_spec, False], utf8strings=UTF8STRINGS, protoid=0)) + return + if (isinstance(oprot, TCompactProtocol.TCompactProtocolAccelerated) or (isinstance(oprot, THeaderProtocol.THeaderProtocolAccelerate) and oprot.get_protocol_id() == THeaderProtocol.THeaderProtocol.T_COMPACT_PROTOCOL)) and self.thrift_spec is not None and fastproto is not None: + oprot.trans.write(fastproto.encode(self, [self.__class__, self.thrift_spec, False], utf8strings=UTF8STRINGS, protoid=2)) + return + oprot.writeStructBegin('getDstBySrc_args') + if self.req != None: + oprot.writeFieldBegin('req', TType.STRUCT, 1) + self.req.write(oprot) + oprot.writeFieldEnd() + oprot.writeFieldStop() + oprot.writeStructEnd() + + def __repr__(self): + L = [] + padding = ' ' * 4 + if self.req is not None: + value = pprint.pformat(self.req, indent=0) + value = padding.join(value.splitlines(True)) + L.append(' req=%s' % (value)) + return "%s(%s)" % (self.__class__.__name__, "\n" + ",\n".join(L) if L else '') + + def __eq__(self, other): + if not isinstance(other, self.__class__): + return False + + return self.__dict__ == other.__dict__ + + def __ne__(self, other): + return not (self == other) + + # Override the __hash__ function for Python3 - t10434117 + __hash__ = object.__hash__ + +all_structs.append(getDstBySrc_args) +getDstBySrc_args.thrift_spec = ( + None, # 0 + (1, TType.STRUCT, 'req', [GetDstBySrcRequest, GetDstBySrcRequest.thrift_spec, False], None, 2, ), # 1 +) + +getDstBySrc_args.thrift_struct_annotations = { +} +getDstBySrc_args.thrift_field_annotations = { +} + +def getDstBySrc_args__init__(self, req=None,): + self.req = req + +getDstBySrc_args.__init__ = getDstBySrc_args__init__ + +def getDstBySrc_args__setstate__(self, state): + state.setdefault('req', None) + self.__dict__ = state + +getDstBySrc_args.__getstate__ = lambda self: self.__dict__.copy() +getDstBySrc_args.__setstate__ = getDstBySrc_args__setstate__ + +class getDstBySrc_result: + """ + Attributes: + - success + """ + + thrift_spec = None + thrift_field_annotations = None + thrift_struct_annotations = None + __init__ = None + @staticmethod + def isUnion(): + return False + + def read(self, iprot): + if (isinstance(iprot, TBinaryProtocol.TBinaryProtocolAccelerated) or (isinstance(iprot, THeaderProtocol.THeaderProtocolAccelerate) and iprot.get_protocol_id() == THeaderProtocol.THeaderProtocol.T_BINARY_PROTOCOL)) and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastproto is not None: + fastproto.decode(self, iprot.trans, [self.__class__, self.thrift_spec, False], utf8strings=UTF8STRINGS, protoid=0) + return + if (isinstance(iprot, TCompactProtocol.TCompactProtocolAccelerated) or (isinstance(iprot, THeaderProtocol.THeaderProtocolAccelerate) and iprot.get_protocol_id() == THeaderProtocol.THeaderProtocol.T_COMPACT_PROTOCOL)) and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastproto is not None: + fastproto.decode(self, iprot.trans, [self.__class__, self.thrift_spec, False], utf8strings=UTF8STRINGS, protoid=2) + return + iprot.readStructBegin() + while True: + (fname, ftype, fid) = iprot.readFieldBegin() + if ftype == TType.STOP: + break + if fid == 0: + if ftype == TType.STRUCT: + self.success = GetDstBySrcResponse() + self.success.read(iprot) + else: + iprot.skip(ftype) + else: + iprot.skip(ftype) + iprot.readFieldEnd() + iprot.readStructEnd() + + def write(self, oprot): + if (isinstance(oprot, TBinaryProtocol.TBinaryProtocolAccelerated) or (isinstance(oprot, THeaderProtocol.THeaderProtocolAccelerate) and oprot.get_protocol_id() == THeaderProtocol.THeaderProtocol.T_BINARY_PROTOCOL)) and self.thrift_spec is not None and fastproto is not None: + oprot.trans.write(fastproto.encode(self, [self.__class__, self.thrift_spec, False], utf8strings=UTF8STRINGS, protoid=0)) + return + if (isinstance(oprot, TCompactProtocol.TCompactProtocolAccelerated) or (isinstance(oprot, THeaderProtocol.THeaderProtocolAccelerate) and oprot.get_protocol_id() == THeaderProtocol.THeaderProtocol.T_COMPACT_PROTOCOL)) and self.thrift_spec is not None and fastproto is not None: + oprot.trans.write(fastproto.encode(self, [self.__class__, self.thrift_spec, False], utf8strings=UTF8STRINGS, protoid=2)) + return + oprot.writeStructBegin('getDstBySrc_result') + if self.success != None: + oprot.writeFieldBegin('success', TType.STRUCT, 0) + self.success.write(oprot) + oprot.writeFieldEnd() + oprot.writeFieldStop() + oprot.writeStructEnd() + + def __repr__(self): + L = [] + padding = ' ' * 4 + if self.success is not None: + value = pprint.pformat(self.success, indent=0) + value = padding.join(value.splitlines(True)) + L.append(' success=%s' % (value)) + return "%s(%s)" % (self.__class__.__name__, "\n" + ",\n".join(L) if L else '') + + def __eq__(self, other): + if not isinstance(other, self.__class__): + return False + + return self.__dict__ == other.__dict__ + + def __ne__(self, other): + return not (self == other) + + # Override the __hash__ function for Python3 - t10434117 + __hash__ = object.__hash__ + +all_structs.append(getDstBySrc_result) +getDstBySrc_result.thrift_spec = ( + (0, TType.STRUCT, 'success', [GetDstBySrcResponse, GetDstBySrcResponse.thrift_spec, False], None, 2, ), # 0 +) + +getDstBySrc_result.thrift_struct_annotations = { +} +getDstBySrc_result.thrift_field_annotations = { +} + +def getDstBySrc_result__init__(self, success=None,): + self.success = success + +getDstBySrc_result.__init__ = getDstBySrc_result__init__ + +def getDstBySrc_result__setstate__(self, state): + state.setdefault('success', None) + self.__dict__ = state + +getDstBySrc_result.__getstate__ = lambda self: self.__dict__.copy() +getDstBySrc_result.__setstate__ = getDstBySrc_result__setstate__ + class getProps_args: """ Attributes: @@ -4193,6 +4398,36 @@ def recv_getNeighbors(self, ): return result.success raise TApplicationException(TApplicationException.MISSING_RESULT, "getNeighbors failed: unknown result"); + def getDstBySrc(self, req=None): + """ + Parameters: + - req + """ + self.send_getDstBySrc(req) + return self.recv_getDstBySrc() + + def send_getDstBySrc(self, req=None): + self._oprot.writeMessageBegin('getDstBySrc', TMessageType.CALL, self._seqid) + args = getDstBySrc_args() + args.req = req + args.write(self._oprot) + self._oprot.writeMessageEnd() + self._oprot.trans.flush() + + def recv_getDstBySrc(self, ): + (fname, mtype, rseqid) = self._iprot.readMessageBegin() + if mtype == TMessageType.EXCEPTION: + x = TApplicationException() + x.read(self._iprot) + self._iprot.readMessageEnd() + raise x + result = getDstBySrc_result() + result.read(self._iprot) + self._iprot.readMessageEnd() + if result.success != None: + return result.success + raise TApplicationException(TApplicationException.MISSING_RESULT, "getDstBySrc failed: unknown result"); + def getProps(self, req=None): """ Parameters: @@ -4774,6 +5009,8 @@ def __init__(self, handler): self._priorityMap = {} self._processMap["getNeighbors"] = Processor.process_getNeighbors self._priorityMap["getNeighbors"] = TPriority.NORMAL + self._processMap["getDstBySrc"] = Processor.process_getDstBySrc + self._priorityMap["getDstBySrc"] = TPriority.NORMAL self._processMap["getProps"] = Processor.process_getProps self._priorityMap["getProps"] = TPriority.NORMAL self._processMap["addVertices"] = Processor.process_addVertices @@ -4832,6 +5069,17 @@ def process_getNeighbors(self, args, handler_ctx): result = Thrift.TApplicationException(message=repr(ex)) return result + @thrift_process_method(getDstBySrc_args, oneway=False) + def process_getDstBySrc(self, args, handler_ctx): + result = getDstBySrc_result() + try: + result.success = self._handler.getDstBySrc(args.req) + except: + ex = sys.exc_info()[1] + self._event_handler.handlerError(handler_ctx, 'getDstBySrc', ex) + result = Thrift.TApplicationException(message=repr(ex)) + return result + @thrift_process_method(getProps_args, oneway=False) def process_getProps(self, args, handler_ctx): result = getProps_result() @@ -5053,6 +5301,8 @@ def __init__(self, handler): self._priorityMap = {} self._processMap["getNeighbors"] = ContextProcessor.process_getNeighbors self._priorityMap["getNeighbors"] = TPriority.NORMAL + self._processMap["getDstBySrc"] = ContextProcessor.process_getDstBySrc + self._priorityMap["getDstBySrc"] = TPriority.NORMAL self._processMap["getProps"] = ContextProcessor.process_getProps self._priorityMap["getProps"] = TPriority.NORMAL self._processMap["addVertices"] = ContextProcessor.process_addVertices @@ -5111,6 +5361,17 @@ def process_getNeighbors(self, args, handler_ctx): result = Thrift.TApplicationException(message=repr(ex)) return result + @thrift_process_method(getDstBySrc_args, oneway=False) + def process_getDstBySrc(self, args, handler_ctx): + result = getDstBySrc_result() + try: + result.success = self._handler.getDstBySrc(handler_ctx, args.req) + except: + ex = sys.exc_info()[1] + self._event_handler.handlerError(handler_ctx, 'getDstBySrc', ex) + result = Thrift.TApplicationException(message=repr(ex)) + return result + @thrift_process_method(getProps_args, oneway=False) def process_getProps(self, args, handler_ctx): result = getProps_result() diff --git a/nebula3/storage/StorageAdminService-fuzzer b/nebula3/storage/StorageAdminService-fuzzer old mode 100755 new mode 100644 diff --git a/nebula3/storage/StorageAdminService-remote b/nebula3/storage/StorageAdminService-remote old mode 100755 new mode 100644 diff --git a/nebula3/storage/StorageAdminService.py b/nebula3/storage/StorageAdminService.py index 8f60dc0c..4be9e4c1 100644 --- a/nebula3/storage/StorageAdminService.py +++ b/nebula3/storage/StorageAdminService.py @@ -12,7 +12,7 @@ from nebula3.fbthrift.protocol.TProtocol import TProtocolException -from .ttypes import UTF8STRINGS, StatType, OrderDirection, EdgeDirection, ScanType, EngineSignType, RequestCommon, PartitionResult, ResponseCommon, StatProp, Expr, EdgeProp, VertexProp, OrderBy, TraverseSpec, GetNeighborsRequest, GetNeighborsResponse, ExecResponse, GetPropRequest, GetPropResponse, NewTag, NewVertex, EdgeKey, NewEdge, AddVerticesRequest, AddEdgesRequest, DeleteVerticesRequest, DeleteEdgesRequest, DelTags, DeleteTagsRequest, UpdateResponse, UpdatedProp, UpdateVertexRequest, UpdateEdgeRequest, GetUUIDReq, GetUUIDResp, LookupIndexResp, IndexColumnHint, IndexQueryContext, IndexSpec, LookupIndexRequest, LookupAndTraverseRequest, ScanCursor, ScanVertexRequest, ScanEdgeRequest, ScanResponse, TaskPara, KVGetRequest, KVGetResponse, KVPutRequest, KVRemoveRequest, AdminExecResp, TransLeaderReq, AddPartReq, AddLearnerReq, RemovePartReq, MemberChangeReq, CatchUpDataReq, GetLeaderReq, CreateCPRequest, CreateCPResp, DropCPRequest, DropCPResp, BlockingSignRequest, BlockingSignResp, GetLeaderPartsResp, CheckPeersReq, RebuildIndexRequest, ListClusterInfoResp, ListClusterInfoReq, AddTaskRequest, AddTaskResp, StopTaskRequest, StopTaskResp, ClearSpaceReq, ClearSpaceResp, ChainAddEdgesRequest, ChainUpdateEdgeRequest, ChainDeleteEdgesRequest +from .ttypes import UTF8STRINGS, StatType, OrderDirection, EdgeDirection, ScanType, EngineSignType, RequestCommon, PartitionResult, ResponseCommon, StatProp, Expr, EdgeProp, VertexProp, OrderBy, TraverseSpec, GetNeighborsRequest, GetNeighborsResponse, GetDstBySrcRequest, GetDstBySrcResponse, ExecResponse, GetPropRequest, GetPropResponse, NewTag, NewVertex, EdgeKey, NewEdge, AddVerticesRequest, AddEdgesRequest, DeleteVerticesRequest, DeleteEdgesRequest, DelTags, DeleteTagsRequest, UpdateResponse, UpdatedProp, UpdateVertexRequest, UpdateEdgeRequest, GetUUIDReq, GetUUIDResp, LookupIndexResp, IndexColumnHint, IndexQueryContext, IndexSpec, LookupIndexRequest, LookupAndTraverseRequest, ScanCursor, ScanVertexRequest, ScanEdgeRequest, ScanResponse, TaskPara, KVGetRequest, KVGetResponse, KVPutRequest, KVRemoveRequest, AdminExecResp, TransLeaderReq, AddPartReq, AddLearnerReq, RemovePartReq, MemberChangeReq, CatchUpDataReq, GetLeaderReq, CreateCPRequest, CreateCPResp, DropCPRequest, DropCPResp, BlockingSignRequest, BlockingSignResp, GetLeaderPartsResp, CheckPeersReq, RebuildIndexRequest, ListClusterInfoResp, ListClusterInfoReq, AddTaskRequest, AddTaskResp, StopTaskRequest, StopTaskResp, ClearSpaceReq, ClearSpaceResp, ChainAddEdgesRequest, ChainUpdateEdgeRequest, ChainDeleteEdgesRequest import nebula3.common.ttypes import nebula3.meta.ttypes diff --git a/nebula3/storage/constants.py b/nebula3/storage/constants.py index 38db6b9b..74e4eea3 100644 --- a/nebula3/storage/constants.py +++ b/nebula3/storage/constants.py @@ -16,5 +16,5 @@ import nebula3.meta.ttypes -from .ttypes import UTF8STRINGS, StatType, OrderDirection, EdgeDirection, ScanType, EngineSignType, RequestCommon, PartitionResult, ResponseCommon, StatProp, Expr, EdgeProp, VertexProp, OrderBy, TraverseSpec, GetNeighborsRequest, GetNeighborsResponse, ExecResponse, GetPropRequest, GetPropResponse, NewTag, NewVertex, EdgeKey, NewEdge, AddVerticesRequest, AddEdgesRequest, DeleteVerticesRequest, DeleteEdgesRequest, DelTags, DeleteTagsRequest, UpdateResponse, UpdatedProp, UpdateVertexRequest, UpdateEdgeRequest, GetUUIDReq, GetUUIDResp, LookupIndexResp, IndexColumnHint, IndexQueryContext, IndexSpec, LookupIndexRequest, LookupAndTraverseRequest, ScanCursor, ScanVertexRequest, ScanEdgeRequest, ScanResponse, TaskPara, KVGetRequest, KVGetResponse, KVPutRequest, KVRemoveRequest, AdminExecResp, TransLeaderReq, AddPartReq, AddLearnerReq, RemovePartReq, MemberChangeReq, CatchUpDataReq, GetLeaderReq, CreateCPRequest, CreateCPResp, DropCPRequest, DropCPResp, BlockingSignRequest, BlockingSignResp, GetLeaderPartsResp, CheckPeersReq, RebuildIndexRequest, ListClusterInfoResp, ListClusterInfoReq, AddTaskRequest, AddTaskResp, StopTaskRequest, StopTaskResp, ClearSpaceReq, ClearSpaceResp, ChainAddEdgesRequest, ChainUpdateEdgeRequest, ChainDeleteEdgesRequest +from .ttypes import UTF8STRINGS, StatType, OrderDirection, EdgeDirection, ScanType, EngineSignType, RequestCommon, PartitionResult, ResponseCommon, StatProp, Expr, EdgeProp, VertexProp, OrderBy, TraverseSpec, GetNeighborsRequest, GetNeighborsResponse, GetDstBySrcRequest, GetDstBySrcResponse, ExecResponse, GetPropRequest, GetPropResponse, NewTag, NewVertex, EdgeKey, NewEdge, AddVerticesRequest, AddEdgesRequest, DeleteVerticesRequest, DeleteEdgesRequest, DelTags, DeleteTagsRequest, UpdateResponse, UpdatedProp, UpdateVertexRequest, UpdateEdgeRequest, GetUUIDReq, GetUUIDResp, LookupIndexResp, IndexColumnHint, IndexQueryContext, IndexSpec, LookupIndexRequest, LookupAndTraverseRequest, ScanCursor, ScanVertexRequest, ScanEdgeRequest, ScanResponse, TaskPara, KVGetRequest, KVGetResponse, KVPutRequest, KVRemoveRequest, AdminExecResp, TransLeaderReq, AddPartReq, AddLearnerReq, RemovePartReq, MemberChangeReq, CatchUpDataReq, GetLeaderReq, CreateCPRequest, CreateCPResp, DropCPRequest, DropCPResp, BlockingSignRequest, BlockingSignResp, GetLeaderPartsResp, CheckPeersReq, RebuildIndexRequest, ListClusterInfoResp, ListClusterInfoReq, AddTaskRequest, AddTaskResp, StopTaskRequest, StopTaskResp, ClearSpaceReq, ClearSpaceResp, ChainAddEdgesRequest, ChainUpdateEdgeRequest, ChainDeleteEdgesRequest diff --git a/nebula3/storage/ttypes.py b/nebula3/storage/ttypes.py index 5ce05993..331d3205 100644 --- a/nebula3/storage/ttypes.py +++ b/nebula3/storage/ttypes.py @@ -31,7 +31,7 @@ all_structs = [] UTF8STRINGS = bool(0) or sys.version_info.major >= 3 -__all__ = ['UTF8STRINGS', 'StatType', 'OrderDirection', 'EdgeDirection', 'ScanType', 'EngineSignType', 'RequestCommon', 'PartitionResult', 'ResponseCommon', 'StatProp', 'Expr', 'EdgeProp', 'VertexProp', 'OrderBy', 'TraverseSpec', 'GetNeighborsRequest', 'GetNeighborsResponse', 'ExecResponse', 'GetPropRequest', 'GetPropResponse', 'NewTag', 'NewVertex', 'EdgeKey', 'NewEdge', 'AddVerticesRequest', 'AddEdgesRequest', 'DeleteVerticesRequest', 'DeleteEdgesRequest', 'DelTags', 'DeleteTagsRequest', 'UpdateResponse', 'UpdatedProp', 'UpdateVertexRequest', 'UpdateEdgeRequest', 'GetUUIDReq', 'GetUUIDResp', 'LookupIndexResp', 'IndexColumnHint', 'IndexQueryContext', 'IndexSpec', 'LookupIndexRequest', 'LookupAndTraverseRequest', 'ScanCursor', 'ScanVertexRequest', 'ScanEdgeRequest', 'ScanResponse', 'TaskPara', 'KVGetRequest', 'KVGetResponse', 'KVPutRequest', 'KVRemoveRequest', 'AdminExecResp', 'TransLeaderReq', 'AddPartReq', 'AddLearnerReq', 'RemovePartReq', 'MemberChangeReq', 'CatchUpDataReq', 'GetLeaderReq', 'CreateCPRequest', 'CreateCPResp', 'DropCPRequest', 'DropCPResp', 'BlockingSignRequest', 'BlockingSignResp', 'GetLeaderPartsResp', 'CheckPeersReq', 'RebuildIndexRequest', 'ListClusterInfoResp', 'ListClusterInfoReq', 'AddTaskRequest', 'AddTaskResp', 'StopTaskRequest', 'StopTaskResp', 'ClearSpaceReq', 'ClearSpaceResp', 'ChainAddEdgesRequest', 'ChainUpdateEdgeRequest', 'ChainDeleteEdgesRequest'] +__all__ = ['UTF8STRINGS', 'StatType', 'OrderDirection', 'EdgeDirection', 'ScanType', 'EngineSignType', 'RequestCommon', 'PartitionResult', 'ResponseCommon', 'StatProp', 'Expr', 'EdgeProp', 'VertexProp', 'OrderBy', 'TraverseSpec', 'GetNeighborsRequest', 'GetNeighborsResponse', 'GetDstBySrcRequest', 'GetDstBySrcResponse', 'ExecResponse', 'GetPropRequest', 'GetPropResponse', 'NewTag', 'NewVertex', 'EdgeKey', 'NewEdge', 'AddVerticesRequest', 'AddEdgesRequest', 'DeleteVerticesRequest', 'DeleteEdgesRequest', 'DelTags', 'DeleteTagsRequest', 'UpdateResponse', 'UpdatedProp', 'UpdateVertexRequest', 'UpdateEdgeRequest', 'GetUUIDReq', 'GetUUIDResp', 'LookupIndexResp', 'IndexColumnHint', 'IndexQueryContext', 'IndexSpec', 'LookupIndexRequest', 'LookupAndTraverseRequest', 'ScanCursor', 'ScanVertexRequest', 'ScanEdgeRequest', 'ScanResponse', 'TaskPara', 'KVGetRequest', 'KVGetResponse', 'KVPutRequest', 'KVRemoveRequest', 'AdminExecResp', 'TransLeaderReq', 'AddPartReq', 'AddLearnerReq', 'RemovePartReq', 'MemberChangeReq', 'CatchUpDataReq', 'GetLeaderReq', 'CreateCPRequest', 'CreateCPResp', 'DropCPRequest', 'DropCPResp', 'BlockingSignRequest', 'BlockingSignResp', 'GetLeaderPartsResp', 'CheckPeersReq', 'RebuildIndexRequest', 'ListClusterInfoResp', 'ListClusterInfoReq', 'AddTaskRequest', 'AddTaskResp', 'StopTaskRequest', 'StopTaskResp', 'ClearSpaceReq', 'ClearSpaceResp', 'ChainAddEdgesRequest', 'ChainUpdateEdgeRequest', 'ChainDeleteEdgesRequest'] class StatType: SUM = 1 @@ -931,6 +931,7 @@ class TraverseSpec: - random - limit - filter + - tag_filter """ thrift_spec = None @@ -1078,6 +1079,11 @@ def read(self, iprot): self.filter = iprot.readString() else: iprot.skip(ftype) + elif fid == 12: + if ftype == TType.STRING: + self.tag_filter = iprot.readString() + else: + iprot.skip(ftype) else: iprot.skip(ftype) iprot.readFieldEnd() @@ -1153,6 +1159,10 @@ def write(self, oprot): oprot.writeFieldBegin('filter', TType.STRING, 11) oprot.writeString(self.filter) oprot.writeFieldEnd() + if self.tag_filter != None: + oprot.writeFieldBegin('tag_filter', TType.STRING, 12) + oprot.writeString(self.tag_filter) + oprot.writeFieldEnd() oprot.writeFieldStop() oprot.writeStructEnd() @@ -1203,6 +1213,10 @@ def __repr__(self): value = pprint.pformat(self.filter, indent=0) value = padding.join(value.splitlines(True)) L.append(' filter=%s' % (value)) + if self.tag_filter is not None: + value = pprint.pformat(self.tag_filter, indent=0) + value = padding.join(value.splitlines(True)) + L.append(' tag_filter=%s' % (value)) return "%s(%s)" % (self.__class__.__name__, "\n" + ",\n".join(L) if L else '') def __eq__(self, other): @@ -1278,12 +1292,12 @@ def read(self, iprot): (_etype100, _size97) = iprot.readListBegin() if _size97 >= 0: for _i101 in range(_size97): - _elem102 = nebula3.common.ttypes.Row() + _elem102 = nebula3.common.ttypes.Value() _elem102.read(iprot) _val96.append(_elem102) else: while iprot.peekList(): - _elem103 = nebula3.common.ttypes.Row() + _elem103 = nebula3.common.ttypes.Value() _elem103.read(iprot) _val96.append(_elem103) iprot.readListEnd() @@ -1295,12 +1309,12 @@ def read(self, iprot): (_etype109, _size106) = iprot.readListBegin() if _size106 >= 0: for _i110 in range(_size106): - _elem111 = nebula3.common.ttypes.Row() + _elem111 = nebula3.common.ttypes.Value() _elem111.read(iprot) _val105.append(_elem111) else: while iprot.peekList(): - _elem112 = nebula3.common.ttypes.Row() + _elem112 = nebula3.common.ttypes.Value() _elem112.read(iprot) _val105.append(_elem112) iprot.readListEnd() @@ -1491,6 +1505,265 @@ def __ne__(self, other): # Override the __hash__ function for Python3 - t10434117 __hash__ = object.__hash__ +class GetDstBySrcRequest: + """ + Attributes: + - space_id + - parts + - edge_types + - common + """ + + thrift_spec = None + thrift_field_annotations = None + thrift_struct_annotations = None + __init__ = None + @staticmethod + def isUnion(): + return False + + def read(self, iprot): + if (isinstance(iprot, TBinaryProtocol.TBinaryProtocolAccelerated) or (isinstance(iprot, THeaderProtocol.THeaderProtocolAccelerate) and iprot.get_protocol_id() == THeaderProtocol.THeaderProtocol.T_BINARY_PROTOCOL)) and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastproto is not None: + fastproto.decode(self, iprot.trans, [self.__class__, self.thrift_spec, False], utf8strings=UTF8STRINGS, protoid=0) + return + if (isinstance(iprot, TCompactProtocol.TCompactProtocolAccelerated) or (isinstance(iprot, THeaderProtocol.THeaderProtocolAccelerate) and iprot.get_protocol_id() == THeaderProtocol.THeaderProtocol.T_COMPACT_PROTOCOL)) and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastproto is not None: + fastproto.decode(self, iprot.trans, [self.__class__, self.thrift_spec, False], utf8strings=UTF8STRINGS, protoid=2) + return + iprot.readStructBegin() + while True: + (fname, ftype, fid) = iprot.readFieldBegin() + if ftype == TType.STOP: + break + if fid == 1: + if ftype == TType.I32: + self.space_id = iprot.readI32() + else: + iprot.skip(ftype) + elif fid == 2: + if ftype == TType.MAP: + self.parts = {} + (_ktype118, _vtype119, _size117 ) = iprot.readMapBegin() + if _size117 >= 0: + for _i121 in range(_size117): + _key122 = iprot.readI32() + _val123 = [] + (_etype127, _size124) = iprot.readListBegin() + if _size124 >= 0: + for _i128 in range(_size124): + _elem129 = nebula3.common.ttypes.Value() + _elem129.read(iprot) + _val123.append(_elem129) + else: + while iprot.peekList(): + _elem130 = nebula3.common.ttypes.Value() + _elem130.read(iprot) + _val123.append(_elem130) + iprot.readListEnd() + self.parts[_key122] = _val123 + else: + while iprot.peekMap(): + _key131 = iprot.readI32() + _val132 = [] + (_etype136, _size133) = iprot.readListBegin() + if _size133 >= 0: + for _i137 in range(_size133): + _elem138 = nebula3.common.ttypes.Value() + _elem138.read(iprot) + _val132.append(_elem138) + else: + while iprot.peekList(): + _elem139 = nebula3.common.ttypes.Value() + _elem139.read(iprot) + _val132.append(_elem139) + iprot.readListEnd() + self.parts[_key131] = _val132 + iprot.readMapEnd() + else: + iprot.skip(ftype) + elif fid == 3: + if ftype == TType.LIST: + self.edge_types = [] + (_etype143, _size140) = iprot.readListBegin() + if _size140 >= 0: + for _i144 in range(_size140): + _elem145 = iprot.readI32() + self.edge_types.append(_elem145) + else: + while iprot.peekList(): + _elem146 = iprot.readI32() + self.edge_types.append(_elem146) + iprot.readListEnd() + else: + iprot.skip(ftype) + elif fid == 4: + if ftype == TType.STRUCT: + self.common = RequestCommon() + self.common.read(iprot) + else: + iprot.skip(ftype) + else: + iprot.skip(ftype) + iprot.readFieldEnd() + iprot.readStructEnd() + + def write(self, oprot): + if (isinstance(oprot, TBinaryProtocol.TBinaryProtocolAccelerated) or (isinstance(oprot, THeaderProtocol.THeaderProtocolAccelerate) and oprot.get_protocol_id() == THeaderProtocol.THeaderProtocol.T_BINARY_PROTOCOL)) and self.thrift_spec is not None and fastproto is not None: + oprot.trans.write(fastproto.encode(self, [self.__class__, self.thrift_spec, False], utf8strings=UTF8STRINGS, protoid=0)) + return + if (isinstance(oprot, TCompactProtocol.TCompactProtocolAccelerated) or (isinstance(oprot, THeaderProtocol.THeaderProtocolAccelerate) and oprot.get_protocol_id() == THeaderProtocol.THeaderProtocol.T_COMPACT_PROTOCOL)) and self.thrift_spec is not None and fastproto is not None: + oprot.trans.write(fastproto.encode(self, [self.__class__, self.thrift_spec, False], utf8strings=UTF8STRINGS, protoid=2)) + return + oprot.writeStructBegin('GetDstBySrcRequest') + if self.space_id != None: + oprot.writeFieldBegin('space_id', TType.I32, 1) + oprot.writeI32(self.space_id) + oprot.writeFieldEnd() + if self.parts != None: + oprot.writeFieldBegin('parts', TType.MAP, 2) + oprot.writeMapBegin(TType.I32, TType.LIST, len(self.parts)) + for kiter147,viter148 in self.parts.items(): + oprot.writeI32(kiter147) + oprot.writeListBegin(TType.STRUCT, len(viter148)) + for iter149 in viter148: + iter149.write(oprot) + oprot.writeListEnd() + oprot.writeMapEnd() + oprot.writeFieldEnd() + if self.edge_types != None: + oprot.writeFieldBegin('edge_types', TType.LIST, 3) + oprot.writeListBegin(TType.I32, len(self.edge_types)) + for iter150 in self.edge_types: + oprot.writeI32(iter150) + oprot.writeListEnd() + oprot.writeFieldEnd() + if self.common != None: + oprot.writeFieldBegin('common', TType.STRUCT, 4) + self.common.write(oprot) + oprot.writeFieldEnd() + oprot.writeFieldStop() + oprot.writeStructEnd() + + def __repr__(self): + L = [] + padding = ' ' * 4 + if self.space_id is not None: + value = pprint.pformat(self.space_id, indent=0) + value = padding.join(value.splitlines(True)) + L.append(' space_id=%s' % (value)) + if self.parts is not None: + value = pprint.pformat(self.parts, indent=0) + value = padding.join(value.splitlines(True)) + L.append(' parts=%s' % (value)) + if self.edge_types is not None: + value = pprint.pformat(self.edge_types, indent=0) + value = padding.join(value.splitlines(True)) + L.append(' edge_types=%s' % (value)) + if self.common is not None: + value = pprint.pformat(self.common, indent=0) + value = padding.join(value.splitlines(True)) + L.append(' common=%s' % (value)) + return "%s(%s)" % (self.__class__.__name__, "\n" + ",\n".join(L) if L else '') + + def __eq__(self, other): + if not isinstance(other, self.__class__): + return False + + return self.__dict__ == other.__dict__ + + def __ne__(self, other): + return not (self == other) + + # Override the __hash__ function for Python3 - t10434117 + __hash__ = object.__hash__ + +class GetDstBySrcResponse: + """ + Attributes: + - result + - dsts + """ + + thrift_spec = None + thrift_field_annotations = None + thrift_struct_annotations = None + __init__ = None + @staticmethod + def isUnion(): + return False + + def read(self, iprot): + if (isinstance(iprot, TBinaryProtocol.TBinaryProtocolAccelerated) or (isinstance(iprot, THeaderProtocol.THeaderProtocolAccelerate) and iprot.get_protocol_id() == THeaderProtocol.THeaderProtocol.T_BINARY_PROTOCOL)) and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastproto is not None: + fastproto.decode(self, iprot.trans, [self.__class__, self.thrift_spec, False], utf8strings=UTF8STRINGS, protoid=0) + return + if (isinstance(iprot, TCompactProtocol.TCompactProtocolAccelerated) or (isinstance(iprot, THeaderProtocol.THeaderProtocolAccelerate) and iprot.get_protocol_id() == THeaderProtocol.THeaderProtocol.T_COMPACT_PROTOCOL)) and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastproto is not None: + fastproto.decode(self, iprot.trans, [self.__class__, self.thrift_spec, False], utf8strings=UTF8STRINGS, protoid=2) + return + iprot.readStructBegin() + while True: + (fname, ftype, fid) = iprot.readFieldBegin() + if ftype == TType.STOP: + break + if fid == 1: + if ftype == TType.STRUCT: + self.result = ResponseCommon() + self.result.read(iprot) + else: + iprot.skip(ftype) + elif fid == 2: + if ftype == TType.STRUCT: + self.dsts = nebula3.common.ttypes.DataSet() + self.dsts.read(iprot) + else: + iprot.skip(ftype) + else: + iprot.skip(ftype) + iprot.readFieldEnd() + iprot.readStructEnd() + + def write(self, oprot): + if (isinstance(oprot, TBinaryProtocol.TBinaryProtocolAccelerated) or (isinstance(oprot, THeaderProtocol.THeaderProtocolAccelerate) and oprot.get_protocol_id() == THeaderProtocol.THeaderProtocol.T_BINARY_PROTOCOL)) and self.thrift_spec is not None and fastproto is not None: + oprot.trans.write(fastproto.encode(self, [self.__class__, self.thrift_spec, False], utf8strings=UTF8STRINGS, protoid=0)) + return + if (isinstance(oprot, TCompactProtocol.TCompactProtocolAccelerated) or (isinstance(oprot, THeaderProtocol.THeaderProtocolAccelerate) and oprot.get_protocol_id() == THeaderProtocol.THeaderProtocol.T_COMPACT_PROTOCOL)) and self.thrift_spec is not None and fastproto is not None: + oprot.trans.write(fastproto.encode(self, [self.__class__, self.thrift_spec, False], utf8strings=UTF8STRINGS, protoid=2)) + return + oprot.writeStructBegin('GetDstBySrcResponse') + if self.result != None: + oprot.writeFieldBegin('result', TType.STRUCT, 1) + self.result.write(oprot) + oprot.writeFieldEnd() + if self.dsts != None: + oprot.writeFieldBegin('dsts', TType.STRUCT, 2) + self.dsts.write(oprot) + oprot.writeFieldEnd() + oprot.writeFieldStop() + oprot.writeStructEnd() + + def __repr__(self): + L = [] + padding = ' ' * 4 + if self.result is not None: + value = pprint.pformat(self.result, indent=0) + value = padding.join(value.splitlines(True)) + L.append(' result=%s' % (value)) + if self.dsts is not None: + value = pprint.pformat(self.dsts, indent=0) + value = padding.join(value.splitlines(True)) + L.append(' dsts=%s' % (value)) + return "%s(%s)" % (self.__class__.__name__, "\n" + ",\n".join(L) if L else '') + + def __eq__(self, other): + if not isinstance(other, self.__class__): + return False + + return self.__dict__ == other.__dict__ + + def __ne__(self, other): + return not (self == other) + + # Override the __hash__ function for Python3 - t10434117 + __hash__ = object.__hash__ + class ExecResponse: """ Attributes: @@ -1607,92 +1880,92 @@ def read(self, iprot): elif fid == 2: if ftype == TType.MAP: self.parts = {} - (_ktype118, _vtype119, _size117 ) = iprot.readMapBegin() - if _size117 >= 0: - for _i121 in range(_size117): - _key122 = iprot.readI32() - _val123 = [] - (_etype127, _size124) = iprot.readListBegin() - if _size124 >= 0: - for _i128 in range(_size124): - _elem129 = nebula3.common.ttypes.Row() - _elem129.read(iprot) - _val123.append(_elem129) + (_ktype152, _vtype153, _size151 ) = iprot.readMapBegin() + if _size151 >= 0: + for _i155 in range(_size151): + _key156 = iprot.readI32() + _val157 = [] + (_etype161, _size158) = iprot.readListBegin() + if _size158 >= 0: + for _i162 in range(_size158): + _elem163 = nebula3.common.ttypes.Row() + _elem163.read(iprot) + _val157.append(_elem163) else: while iprot.peekList(): - _elem130 = nebula3.common.ttypes.Row() - _elem130.read(iprot) - _val123.append(_elem130) + _elem164 = nebula3.common.ttypes.Row() + _elem164.read(iprot) + _val157.append(_elem164) iprot.readListEnd() - self.parts[_key122] = _val123 + self.parts[_key156] = _val157 else: while iprot.peekMap(): - _key131 = iprot.readI32() - _val132 = [] - (_etype136, _size133) = iprot.readListBegin() - if _size133 >= 0: - for _i137 in range(_size133): - _elem138 = nebula3.common.ttypes.Row() - _elem138.read(iprot) - _val132.append(_elem138) + _key165 = iprot.readI32() + _val166 = [] + (_etype170, _size167) = iprot.readListBegin() + if _size167 >= 0: + for _i171 in range(_size167): + _elem172 = nebula3.common.ttypes.Row() + _elem172.read(iprot) + _val166.append(_elem172) else: while iprot.peekList(): - _elem139 = nebula3.common.ttypes.Row() - _elem139.read(iprot) - _val132.append(_elem139) + _elem173 = nebula3.common.ttypes.Row() + _elem173.read(iprot) + _val166.append(_elem173) iprot.readListEnd() - self.parts[_key131] = _val132 + self.parts[_key165] = _val166 iprot.readMapEnd() else: iprot.skip(ftype) elif fid == 3: if ftype == TType.LIST: self.vertex_props = [] - (_etype143, _size140) = iprot.readListBegin() - if _size140 >= 0: - for _i144 in range(_size140): - _elem145 = VertexProp() - _elem145.read(iprot) - self.vertex_props.append(_elem145) + (_etype177, _size174) = iprot.readListBegin() + if _size174 >= 0: + for _i178 in range(_size174): + _elem179 = VertexProp() + _elem179.read(iprot) + self.vertex_props.append(_elem179) else: while iprot.peekList(): - _elem146 = VertexProp() - _elem146.read(iprot) - self.vertex_props.append(_elem146) + _elem180 = VertexProp() + _elem180.read(iprot) + self.vertex_props.append(_elem180) iprot.readListEnd() else: iprot.skip(ftype) elif fid == 4: if ftype == TType.LIST: self.edge_props = [] - (_etype150, _size147) = iprot.readListBegin() - if _size147 >= 0: - for _i151 in range(_size147): - _elem152 = EdgeProp() - _elem152.read(iprot) - self.edge_props.append(_elem152) + (_etype184, _size181) = iprot.readListBegin() + if _size181 >= 0: + for _i185 in range(_size181): + _elem186 = EdgeProp() + _elem186.read(iprot) + self.edge_props.append(_elem186) else: while iprot.peekList(): - _elem153 = EdgeProp() - _elem153.read(iprot) - self.edge_props.append(_elem153) + _elem187 = EdgeProp() + _elem187.read(iprot) + self.edge_props.append(_elem187) iprot.readListEnd() else: iprot.skip(ftype) elif fid == 5: if ftype == TType.LIST: self.expressions = [] - (_etype157, _size154) = iprot.readListBegin() - if _size154 >= 0: - for _i158 in range(_size154): - _elem159 = Expr() - _elem159.read(iprot) - self.expressions.append(_elem159) + (_etype191, _size188) = iprot.readListBegin() + if _size188 >= 0: + for _i192 in range(_size188): + _elem193 = Expr() + _elem193.read(iprot) + self.expressions.append(_elem193) else: while iprot.peekList(): - _elem160 = Expr() - _elem160.read(iprot) - self.expressions.append(_elem160) + _elem194 = Expr() + _elem194.read(iprot) + self.expressions.append(_elem194) iprot.readListEnd() else: iprot.skip(ftype) @@ -1704,17 +1977,17 @@ def read(self, iprot): elif fid == 7: if ftype == TType.LIST: self.order_by = [] - (_etype164, _size161) = iprot.readListBegin() - if _size161 >= 0: - for _i165 in range(_size161): - _elem166 = OrderBy() - _elem166.read(iprot) - self.order_by.append(_elem166) + (_etype198, _size195) = iprot.readListBegin() + if _size195 >= 0: + for _i199 in range(_size195): + _elem200 = OrderBy() + _elem200.read(iprot) + self.order_by.append(_elem200) else: while iprot.peekList(): - _elem167 = OrderBy() - _elem167.read(iprot) - self.order_by.append(_elem167) + _elem201 = OrderBy() + _elem201.read(iprot) + self.order_by.append(_elem201) iprot.readListEnd() else: iprot.skip(ftype) @@ -1754,33 +2027,33 @@ def write(self, oprot): if self.parts != None: oprot.writeFieldBegin('parts', TType.MAP, 2) oprot.writeMapBegin(TType.I32, TType.LIST, len(self.parts)) - for kiter168,viter169 in self.parts.items(): - oprot.writeI32(kiter168) - oprot.writeListBegin(TType.STRUCT, len(viter169)) - for iter170 in viter169: - iter170.write(oprot) + for kiter202,viter203 in self.parts.items(): + oprot.writeI32(kiter202) + oprot.writeListBegin(TType.STRUCT, len(viter203)) + for iter204 in viter203: + iter204.write(oprot) oprot.writeListEnd() oprot.writeMapEnd() oprot.writeFieldEnd() if self.vertex_props != None: oprot.writeFieldBegin('vertex_props', TType.LIST, 3) oprot.writeListBegin(TType.STRUCT, len(self.vertex_props)) - for iter171 in self.vertex_props: - iter171.write(oprot) + for iter205 in self.vertex_props: + iter205.write(oprot) oprot.writeListEnd() oprot.writeFieldEnd() if self.edge_props != None: oprot.writeFieldBegin('edge_props', TType.LIST, 4) oprot.writeListBegin(TType.STRUCT, len(self.edge_props)) - for iter172 in self.edge_props: - iter172.write(oprot) + for iter206 in self.edge_props: + iter206.write(oprot) oprot.writeListEnd() oprot.writeFieldEnd() if self.expressions != None: oprot.writeFieldBegin('expressions', TType.LIST, 5) oprot.writeListBegin(TType.STRUCT, len(self.expressions)) - for iter173 in self.expressions: - iter173.write(oprot) + for iter207 in self.expressions: + iter207.write(oprot) oprot.writeListEnd() oprot.writeFieldEnd() if self.dedup != None: @@ -1790,8 +2063,8 @@ def write(self, oprot): if self.order_by != None: oprot.writeFieldBegin('order_by', TType.LIST, 7) oprot.writeListBegin(TType.STRUCT, len(self.order_by)) - for iter174 in self.order_by: - iter174.write(oprot) + for iter208 in self.order_by: + iter208.write(oprot) oprot.writeListEnd() oprot.writeFieldEnd() if self.limit != None: @@ -1989,17 +2262,17 @@ def read(self, iprot): elif fid == 2: if ftype == TType.LIST: self.props = [] - (_etype178, _size175) = iprot.readListBegin() - if _size175 >= 0: - for _i179 in range(_size175): - _elem180 = nebula3.common.ttypes.Value() - _elem180.read(iprot) - self.props.append(_elem180) + (_etype212, _size209) = iprot.readListBegin() + if _size209 >= 0: + for _i213 in range(_size209): + _elem214 = nebula3.common.ttypes.Value() + _elem214.read(iprot) + self.props.append(_elem214) else: while iprot.peekList(): - _elem181 = nebula3.common.ttypes.Value() - _elem181.read(iprot) - self.props.append(_elem181) + _elem215 = nebula3.common.ttypes.Value() + _elem215.read(iprot) + self.props.append(_elem215) iprot.readListEnd() else: iprot.skip(ftype) @@ -2023,8 +2296,8 @@ def write(self, oprot): if self.props != None: oprot.writeFieldBegin('props', TType.LIST, 2) oprot.writeListBegin(TType.STRUCT, len(self.props)) - for iter182 in self.props: - iter182.write(oprot) + for iter216 in self.props: + iter216.write(oprot) oprot.writeListEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -2091,17 +2364,17 @@ def read(self, iprot): elif fid == 2: if ftype == TType.LIST: self.tags = [] - (_etype186, _size183) = iprot.readListBegin() - if _size183 >= 0: - for _i187 in range(_size183): - _elem188 = NewTag() - _elem188.read(iprot) - self.tags.append(_elem188) + (_etype220, _size217) = iprot.readListBegin() + if _size217 >= 0: + for _i221 in range(_size217): + _elem222 = NewTag() + _elem222.read(iprot) + self.tags.append(_elem222) else: while iprot.peekList(): - _elem189 = NewTag() - _elem189.read(iprot) - self.tags.append(_elem189) + _elem223 = NewTag() + _elem223.read(iprot) + self.tags.append(_elem223) iprot.readListEnd() else: iprot.skip(ftype) @@ -2125,8 +2398,8 @@ def write(self, oprot): if self.tags != None: oprot.writeFieldBegin('tags', TType.LIST, 2) oprot.writeListBegin(TType.STRUCT, len(self.tags)) - for iter190 in self.tags: - iter190.write(oprot) + for iter224 in self.tags: + iter224.write(oprot) oprot.writeListEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -2309,17 +2582,17 @@ def read(self, iprot): elif fid == 2: if ftype == TType.LIST: self.props = [] - (_etype194, _size191) = iprot.readListBegin() - if _size191 >= 0: - for _i195 in range(_size191): - _elem196 = nebula3.common.ttypes.Value() - _elem196.read(iprot) - self.props.append(_elem196) + (_etype228, _size225) = iprot.readListBegin() + if _size225 >= 0: + for _i229 in range(_size225): + _elem230 = nebula3.common.ttypes.Value() + _elem230.read(iprot) + self.props.append(_elem230) else: while iprot.peekList(): - _elem197 = nebula3.common.ttypes.Value() - _elem197.read(iprot) - self.props.append(_elem197) + _elem231 = nebula3.common.ttypes.Value() + _elem231.read(iprot) + self.props.append(_elem231) iprot.readListEnd() else: iprot.skip(ftype) @@ -2343,8 +2616,8 @@ def write(self, oprot): if self.props != None: oprot.writeFieldBegin('props', TType.LIST, 2) oprot.writeListBegin(TType.STRUCT, len(self.props)) - for iter198 in self.props: - iter198.write(oprot) + for iter232 in self.props: + iter232.write(oprot) oprot.writeListEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -2414,78 +2687,78 @@ def read(self, iprot): elif fid == 2: if ftype == TType.MAP: self.parts = {} - (_ktype200, _vtype201, _size199 ) = iprot.readMapBegin() - if _size199 >= 0: - for _i203 in range(_size199): - _key204 = iprot.readI32() - _val205 = [] - (_etype209, _size206) = iprot.readListBegin() - if _size206 >= 0: - for _i210 in range(_size206): - _elem211 = NewVertex() - _elem211.read(iprot) - _val205.append(_elem211) + (_ktype234, _vtype235, _size233 ) = iprot.readMapBegin() + if _size233 >= 0: + for _i237 in range(_size233): + _key238 = iprot.readI32() + _val239 = [] + (_etype243, _size240) = iprot.readListBegin() + if _size240 >= 0: + for _i244 in range(_size240): + _elem245 = NewVertex() + _elem245.read(iprot) + _val239.append(_elem245) else: while iprot.peekList(): - _elem212 = NewVertex() - _elem212.read(iprot) - _val205.append(_elem212) + _elem246 = NewVertex() + _elem246.read(iprot) + _val239.append(_elem246) iprot.readListEnd() - self.parts[_key204] = _val205 + self.parts[_key238] = _val239 else: while iprot.peekMap(): - _key213 = iprot.readI32() - _val214 = [] - (_etype218, _size215) = iprot.readListBegin() - if _size215 >= 0: - for _i219 in range(_size215): - _elem220 = NewVertex() - _elem220.read(iprot) - _val214.append(_elem220) + _key247 = iprot.readI32() + _val248 = [] + (_etype252, _size249) = iprot.readListBegin() + if _size249 >= 0: + for _i253 in range(_size249): + _elem254 = NewVertex() + _elem254.read(iprot) + _val248.append(_elem254) else: while iprot.peekList(): - _elem221 = NewVertex() - _elem221.read(iprot) - _val214.append(_elem221) + _elem255 = NewVertex() + _elem255.read(iprot) + _val248.append(_elem255) iprot.readListEnd() - self.parts[_key213] = _val214 + self.parts[_key247] = _val248 iprot.readMapEnd() else: iprot.skip(ftype) elif fid == 3: if ftype == TType.MAP: self.prop_names = {} - (_ktype223, _vtype224, _size222 ) = iprot.readMapBegin() - if _size222 >= 0: - for _i226 in range(_size222): - _key227 = iprot.readI32() - _val228 = [] - (_etype232, _size229) = iprot.readListBegin() - if _size229 >= 0: - for _i233 in range(_size229): - _elem234 = iprot.readString() - _val228.append(_elem234) + (_ktype257, _vtype258, _size256 ) = iprot.readMapBegin() + if _size256 >= 0: + for _i260 in range(_size256): + _key261 = iprot.readI32() + _val262 = [] + (_etype266, _size263) = iprot.readListBegin() + if _size263 >= 0: + for _i267 in range(_size263): + _elem268 = iprot.readString() + _val262.append(_elem268) else: while iprot.peekList(): - _elem235 = iprot.readString() - _val228.append(_elem235) + _elem269 = iprot.readString() + _val262.append(_elem269) iprot.readListEnd() - self.prop_names[_key227] = _val228 + self.prop_names[_key261] = _val262 else: while iprot.peekMap(): - _key236 = iprot.readI32() - _val237 = [] - (_etype241, _size238) = iprot.readListBegin() - if _size238 >= 0: - for _i242 in range(_size238): - _elem243 = iprot.readString() - _val237.append(_elem243) + _key270 = iprot.readI32() + _val271 = [] + (_etype275, _size272) = iprot.readListBegin() + if _size272 >= 0: + for _i276 in range(_size272): + _elem277 = iprot.readString() + _val271.append(_elem277) else: while iprot.peekList(): - _elem244 = iprot.readString() - _val237.append(_elem244) + _elem278 = iprot.readString() + _val271.append(_elem278) iprot.readListEnd() - self.prop_names[_key236] = _val237 + self.prop_names[_key270] = _val271 iprot.readMapEnd() else: iprot.skip(ftype) @@ -2525,22 +2798,22 @@ def write(self, oprot): if self.parts != None: oprot.writeFieldBegin('parts', TType.MAP, 2) oprot.writeMapBegin(TType.I32, TType.LIST, len(self.parts)) - for kiter245,viter246 in self.parts.items(): - oprot.writeI32(kiter245) - oprot.writeListBegin(TType.STRUCT, len(viter246)) - for iter247 in viter246: - iter247.write(oprot) + for kiter279,viter280 in self.parts.items(): + oprot.writeI32(kiter279) + oprot.writeListBegin(TType.STRUCT, len(viter280)) + for iter281 in viter280: + iter281.write(oprot) oprot.writeListEnd() oprot.writeMapEnd() oprot.writeFieldEnd() if self.prop_names != None: oprot.writeFieldBegin('prop_names', TType.MAP, 3) oprot.writeMapBegin(TType.I32, TType.LIST, len(self.prop_names)) - for kiter248,viter249 in self.prop_names.items(): - oprot.writeI32(kiter248) - oprot.writeListBegin(TType.STRING, len(viter249)) - for iter250 in viter249: - oprot.writeString(iter250) + for kiter282,viter283 in self.prop_names.items(): + oprot.writeI32(kiter282) + oprot.writeListBegin(TType.STRING, len(viter283)) + for iter284 in viter283: + oprot.writeString(iter284) oprot.writeListEnd() oprot.writeMapEnd() oprot.writeFieldEnd() @@ -2639,56 +2912,56 @@ def read(self, iprot): elif fid == 2: if ftype == TType.MAP: self.parts = {} - (_ktype252, _vtype253, _size251 ) = iprot.readMapBegin() - if _size251 >= 0: - for _i255 in range(_size251): - _key256 = iprot.readI32() - _val257 = [] - (_etype261, _size258) = iprot.readListBegin() - if _size258 >= 0: - for _i262 in range(_size258): - _elem263 = NewEdge() - _elem263.read(iprot) - _val257.append(_elem263) + (_ktype286, _vtype287, _size285 ) = iprot.readMapBegin() + if _size285 >= 0: + for _i289 in range(_size285): + _key290 = iprot.readI32() + _val291 = [] + (_etype295, _size292) = iprot.readListBegin() + if _size292 >= 0: + for _i296 in range(_size292): + _elem297 = NewEdge() + _elem297.read(iprot) + _val291.append(_elem297) else: while iprot.peekList(): - _elem264 = NewEdge() - _elem264.read(iprot) - _val257.append(_elem264) + _elem298 = NewEdge() + _elem298.read(iprot) + _val291.append(_elem298) iprot.readListEnd() - self.parts[_key256] = _val257 + self.parts[_key290] = _val291 else: while iprot.peekMap(): - _key265 = iprot.readI32() - _val266 = [] - (_etype270, _size267) = iprot.readListBegin() - if _size267 >= 0: - for _i271 in range(_size267): - _elem272 = NewEdge() - _elem272.read(iprot) - _val266.append(_elem272) + _key299 = iprot.readI32() + _val300 = [] + (_etype304, _size301) = iprot.readListBegin() + if _size301 >= 0: + for _i305 in range(_size301): + _elem306 = NewEdge() + _elem306.read(iprot) + _val300.append(_elem306) else: while iprot.peekList(): - _elem273 = NewEdge() - _elem273.read(iprot) - _val266.append(_elem273) + _elem307 = NewEdge() + _elem307.read(iprot) + _val300.append(_elem307) iprot.readListEnd() - self.parts[_key265] = _val266 + self.parts[_key299] = _val300 iprot.readMapEnd() else: iprot.skip(ftype) elif fid == 3: if ftype == TType.LIST: self.prop_names = [] - (_etype277, _size274) = iprot.readListBegin() - if _size274 >= 0: - for _i278 in range(_size274): - _elem279 = iprot.readString() - self.prop_names.append(_elem279) + (_etype311, _size308) = iprot.readListBegin() + if _size308 >= 0: + for _i312 in range(_size308): + _elem313 = iprot.readString() + self.prop_names.append(_elem313) else: while iprot.peekList(): - _elem280 = iprot.readString() - self.prop_names.append(_elem280) + _elem314 = iprot.readString() + self.prop_names.append(_elem314) iprot.readListEnd() else: iprot.skip(ftype) @@ -2728,19 +3001,19 @@ def write(self, oprot): if self.parts != None: oprot.writeFieldBegin('parts', TType.MAP, 2) oprot.writeMapBegin(TType.I32, TType.LIST, len(self.parts)) - for kiter281,viter282 in self.parts.items(): - oprot.writeI32(kiter281) - oprot.writeListBegin(TType.STRUCT, len(viter282)) - for iter283 in viter282: - iter283.write(oprot) + for kiter315,viter316 in self.parts.items(): + oprot.writeI32(kiter315) + oprot.writeListBegin(TType.STRUCT, len(viter316)) + for iter317 in viter316: + iter317.write(oprot) oprot.writeListEnd() oprot.writeMapEnd() oprot.writeFieldEnd() if self.prop_names != None: oprot.writeFieldBegin('prop_names', TType.LIST, 3) oprot.writeListBegin(TType.STRING, len(self.prop_names)) - for iter284 in self.prop_names: - oprot.writeString(iter284) + for iter318 in self.prop_names: + oprot.writeString(iter318) oprot.writeListEnd() oprot.writeFieldEnd() if self.if_not_exists != None: @@ -2835,41 +3108,41 @@ def read(self, iprot): elif fid == 2: if ftype == TType.MAP: self.parts = {} - (_ktype286, _vtype287, _size285 ) = iprot.readMapBegin() - if _size285 >= 0: - for _i289 in range(_size285): - _key290 = iprot.readI32() - _val291 = [] - (_etype295, _size292) = iprot.readListBegin() - if _size292 >= 0: - for _i296 in range(_size292): - _elem297 = nebula3.common.ttypes.Value() - _elem297.read(iprot) - _val291.append(_elem297) + (_ktype320, _vtype321, _size319 ) = iprot.readMapBegin() + if _size319 >= 0: + for _i323 in range(_size319): + _key324 = iprot.readI32() + _val325 = [] + (_etype329, _size326) = iprot.readListBegin() + if _size326 >= 0: + for _i330 in range(_size326): + _elem331 = nebula3.common.ttypes.Value() + _elem331.read(iprot) + _val325.append(_elem331) else: while iprot.peekList(): - _elem298 = nebula3.common.ttypes.Value() - _elem298.read(iprot) - _val291.append(_elem298) + _elem332 = nebula3.common.ttypes.Value() + _elem332.read(iprot) + _val325.append(_elem332) iprot.readListEnd() - self.parts[_key290] = _val291 + self.parts[_key324] = _val325 else: while iprot.peekMap(): - _key299 = iprot.readI32() - _val300 = [] - (_etype304, _size301) = iprot.readListBegin() - if _size301 >= 0: - for _i305 in range(_size301): - _elem306 = nebula3.common.ttypes.Value() - _elem306.read(iprot) - _val300.append(_elem306) + _key333 = iprot.readI32() + _val334 = [] + (_etype338, _size335) = iprot.readListBegin() + if _size335 >= 0: + for _i339 in range(_size335): + _elem340 = nebula3.common.ttypes.Value() + _elem340.read(iprot) + _val334.append(_elem340) else: while iprot.peekList(): - _elem307 = nebula3.common.ttypes.Value() - _elem307.read(iprot) - _val300.append(_elem307) + _elem341 = nebula3.common.ttypes.Value() + _elem341.read(iprot) + _val334.append(_elem341) iprot.readListEnd() - self.parts[_key299] = _val300 + self.parts[_key333] = _val334 iprot.readMapEnd() else: iprot.skip(ftype) @@ -2899,11 +3172,11 @@ def write(self, oprot): if self.parts != None: oprot.writeFieldBegin('parts', TType.MAP, 2) oprot.writeMapBegin(TType.I32, TType.LIST, len(self.parts)) - for kiter308,viter309 in self.parts.items(): - oprot.writeI32(kiter308) - oprot.writeListBegin(TType.STRUCT, len(viter309)) - for iter310 in viter309: - iter310.write(oprot) + for kiter342,viter343 in self.parts.items(): + oprot.writeI32(kiter342) + oprot.writeListBegin(TType.STRUCT, len(viter343)) + for iter344 in viter343: + iter344.write(oprot) oprot.writeListEnd() oprot.writeMapEnd() oprot.writeFieldEnd() @@ -2979,41 +3252,41 @@ def read(self, iprot): elif fid == 2: if ftype == TType.MAP: self.parts = {} - (_ktype312, _vtype313, _size311 ) = iprot.readMapBegin() - if _size311 >= 0: - for _i315 in range(_size311): - _key316 = iprot.readI32() - _val317 = [] - (_etype321, _size318) = iprot.readListBegin() - if _size318 >= 0: - for _i322 in range(_size318): - _elem323 = EdgeKey() - _elem323.read(iprot) - _val317.append(_elem323) + (_ktype346, _vtype347, _size345 ) = iprot.readMapBegin() + if _size345 >= 0: + for _i349 in range(_size345): + _key350 = iprot.readI32() + _val351 = [] + (_etype355, _size352) = iprot.readListBegin() + if _size352 >= 0: + for _i356 in range(_size352): + _elem357 = EdgeKey() + _elem357.read(iprot) + _val351.append(_elem357) else: while iprot.peekList(): - _elem324 = EdgeKey() - _elem324.read(iprot) - _val317.append(_elem324) + _elem358 = EdgeKey() + _elem358.read(iprot) + _val351.append(_elem358) iprot.readListEnd() - self.parts[_key316] = _val317 + self.parts[_key350] = _val351 else: while iprot.peekMap(): - _key325 = iprot.readI32() - _val326 = [] - (_etype330, _size327) = iprot.readListBegin() - if _size327 >= 0: - for _i331 in range(_size327): - _elem332 = EdgeKey() - _elem332.read(iprot) - _val326.append(_elem332) + _key359 = iprot.readI32() + _val360 = [] + (_etype364, _size361) = iprot.readListBegin() + if _size361 >= 0: + for _i365 in range(_size361): + _elem366 = EdgeKey() + _elem366.read(iprot) + _val360.append(_elem366) else: while iprot.peekList(): - _elem333 = EdgeKey() - _elem333.read(iprot) - _val326.append(_elem333) + _elem367 = EdgeKey() + _elem367.read(iprot) + _val360.append(_elem367) iprot.readListEnd() - self.parts[_key325] = _val326 + self.parts[_key359] = _val360 iprot.readMapEnd() else: iprot.skip(ftype) @@ -3043,11 +3316,11 @@ def write(self, oprot): if self.parts != None: oprot.writeFieldBegin('parts', TType.MAP, 2) oprot.writeMapBegin(TType.I32, TType.LIST, len(self.parts)) - for kiter334,viter335 in self.parts.items(): - oprot.writeI32(kiter334) - oprot.writeListBegin(TType.STRUCT, len(viter335)) - for iter336 in viter335: - iter336.write(oprot) + for kiter368,viter369 in self.parts.items(): + oprot.writeI32(kiter368) + oprot.writeListBegin(TType.STRUCT, len(viter369)) + for iter370 in viter369: + iter370.write(oprot) oprot.writeListEnd() oprot.writeMapEnd() oprot.writeFieldEnd() @@ -3123,15 +3396,15 @@ def read(self, iprot): elif fid == 2: if ftype == TType.LIST: self.tags = [] - (_etype340, _size337) = iprot.readListBegin() - if _size337 >= 0: - for _i341 in range(_size337): - _elem342 = iprot.readI32() - self.tags.append(_elem342) + (_etype374, _size371) = iprot.readListBegin() + if _size371 >= 0: + for _i375 in range(_size371): + _elem376 = iprot.readI32() + self.tags.append(_elem376) else: while iprot.peekList(): - _elem343 = iprot.readI32() - self.tags.append(_elem343) + _elem377 = iprot.readI32() + self.tags.append(_elem377) iprot.readListEnd() else: iprot.skip(ftype) @@ -3155,8 +3428,8 @@ def write(self, oprot): if self.tags != None: oprot.writeFieldBegin('tags', TType.LIST, 2) oprot.writeListBegin(TType.I32, len(self.tags)) - for iter344 in self.tags: - oprot.writeI32(iter344) + for iter378 in self.tags: + oprot.writeI32(iter378) oprot.writeListEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -3223,41 +3496,41 @@ def read(self, iprot): elif fid == 2: if ftype == TType.MAP: self.parts = {} - (_ktype346, _vtype347, _size345 ) = iprot.readMapBegin() - if _size345 >= 0: - for _i349 in range(_size345): - _key350 = iprot.readI32() - _val351 = [] - (_etype355, _size352) = iprot.readListBegin() - if _size352 >= 0: - for _i356 in range(_size352): - _elem357 = DelTags() - _elem357.read(iprot) - _val351.append(_elem357) + (_ktype380, _vtype381, _size379 ) = iprot.readMapBegin() + if _size379 >= 0: + for _i383 in range(_size379): + _key384 = iprot.readI32() + _val385 = [] + (_etype389, _size386) = iprot.readListBegin() + if _size386 >= 0: + for _i390 in range(_size386): + _elem391 = DelTags() + _elem391.read(iprot) + _val385.append(_elem391) else: while iprot.peekList(): - _elem358 = DelTags() - _elem358.read(iprot) - _val351.append(_elem358) + _elem392 = DelTags() + _elem392.read(iprot) + _val385.append(_elem392) iprot.readListEnd() - self.parts[_key350] = _val351 + self.parts[_key384] = _val385 else: while iprot.peekMap(): - _key359 = iprot.readI32() - _val360 = [] - (_etype364, _size361) = iprot.readListBegin() - if _size361 >= 0: - for _i365 in range(_size361): - _elem366 = DelTags() - _elem366.read(iprot) - _val360.append(_elem366) + _key393 = iprot.readI32() + _val394 = [] + (_etype398, _size395) = iprot.readListBegin() + if _size395 >= 0: + for _i399 in range(_size395): + _elem400 = DelTags() + _elem400.read(iprot) + _val394.append(_elem400) else: while iprot.peekList(): - _elem367 = DelTags() - _elem367.read(iprot) - _val360.append(_elem367) + _elem401 = DelTags() + _elem401.read(iprot) + _val394.append(_elem401) iprot.readListEnd() - self.parts[_key359] = _val360 + self.parts[_key393] = _val394 iprot.readMapEnd() else: iprot.skip(ftype) @@ -3287,11 +3560,11 @@ def write(self, oprot): if self.parts != None: oprot.writeFieldBegin('parts', TType.MAP, 2) oprot.writeMapBegin(TType.I32, TType.LIST, len(self.parts)) - for kiter368,viter369 in self.parts.items(): - oprot.writeI32(kiter368) - oprot.writeListBegin(TType.STRUCT, len(viter369)) - for iter370 in viter369: - iter370.write(oprot) + for kiter402,viter403 in self.parts.items(): + oprot.writeI32(kiter402) + oprot.writeListBegin(TType.STRUCT, len(viter403)) + for iter404 in viter403: + iter404.write(oprot) oprot.writeListEnd() oprot.writeMapEnd() oprot.writeFieldEnd() @@ -3563,17 +3836,17 @@ def read(self, iprot): elif fid == 5: if ftype == TType.LIST: self.updated_props = [] - (_etype374, _size371) = iprot.readListBegin() - if _size371 >= 0: - for _i375 in range(_size371): - _elem376 = UpdatedProp() - _elem376.read(iprot) - self.updated_props.append(_elem376) + (_etype408, _size405) = iprot.readListBegin() + if _size405 >= 0: + for _i409 in range(_size405): + _elem410 = UpdatedProp() + _elem410.read(iprot) + self.updated_props.append(_elem410) else: while iprot.peekList(): - _elem377 = UpdatedProp() - _elem377.read(iprot) - self.updated_props.append(_elem377) + _elem411 = UpdatedProp() + _elem411.read(iprot) + self.updated_props.append(_elem411) iprot.readListEnd() else: iprot.skip(ftype) @@ -3585,15 +3858,15 @@ def read(self, iprot): elif fid == 7: if ftype == TType.LIST: self.return_props = [] - (_etype381, _size378) = iprot.readListBegin() - if _size378 >= 0: - for _i382 in range(_size378): - _elem383 = iprot.readString() - self.return_props.append(_elem383) + (_etype415, _size412) = iprot.readListBegin() + if _size412 >= 0: + for _i416 in range(_size412): + _elem417 = iprot.readString() + self.return_props.append(_elem417) else: while iprot.peekList(): - _elem384 = iprot.readString() - self.return_props.append(_elem384) + _elem418 = iprot.readString() + self.return_props.append(_elem418) iprot.readListEnd() else: iprot.skip(ftype) @@ -3640,8 +3913,8 @@ def write(self, oprot): if self.updated_props != None: oprot.writeFieldBegin('updated_props', TType.LIST, 5) oprot.writeListBegin(TType.STRUCT, len(self.updated_props)) - for iter385 in self.updated_props: - iter385.write(oprot) + for iter419 in self.updated_props: + iter419.write(oprot) oprot.writeListEnd() oprot.writeFieldEnd() if self.insertable != None and self.insertable != self.thrift_spec[6][4]: @@ -3651,8 +3924,8 @@ def write(self, oprot): if self.return_props != None: oprot.writeFieldBegin('return_props', TType.LIST, 7) oprot.writeListBegin(TType.STRING, len(self.return_props)) - for iter386 in self.return_props: - oprot.writeString(iter386) + for iter420 in self.return_props: + oprot.writeString(iter420) oprot.writeListEnd() oprot.writeFieldEnd() if self.condition != None: @@ -3771,17 +4044,17 @@ def read(self, iprot): elif fid == 4: if ftype == TType.LIST: self.updated_props = [] - (_etype390, _size387) = iprot.readListBegin() - if _size387 >= 0: - for _i391 in range(_size387): - _elem392 = UpdatedProp() - _elem392.read(iprot) - self.updated_props.append(_elem392) + (_etype424, _size421) = iprot.readListBegin() + if _size421 >= 0: + for _i425 in range(_size421): + _elem426 = UpdatedProp() + _elem426.read(iprot) + self.updated_props.append(_elem426) else: while iprot.peekList(): - _elem393 = UpdatedProp() - _elem393.read(iprot) - self.updated_props.append(_elem393) + _elem427 = UpdatedProp() + _elem427.read(iprot) + self.updated_props.append(_elem427) iprot.readListEnd() else: iprot.skip(ftype) @@ -3793,15 +4066,15 @@ def read(self, iprot): elif fid == 6: if ftype == TType.LIST: self.return_props = [] - (_etype397, _size394) = iprot.readListBegin() - if _size394 >= 0: - for _i398 in range(_size394): - _elem399 = iprot.readString() - self.return_props.append(_elem399) + (_etype431, _size428) = iprot.readListBegin() + if _size428 >= 0: + for _i432 in range(_size428): + _elem433 = iprot.readString() + self.return_props.append(_elem433) else: while iprot.peekList(): - _elem400 = iprot.readString() - self.return_props.append(_elem400) + _elem434 = iprot.readString() + self.return_props.append(_elem434) iprot.readListEnd() else: iprot.skip(ftype) @@ -3844,8 +4117,8 @@ def write(self, oprot): if self.updated_props != None: oprot.writeFieldBegin('updated_props', TType.LIST, 4) oprot.writeListBegin(TType.STRUCT, len(self.updated_props)) - for iter401 in self.updated_props: - iter401.write(oprot) + for iter435 in self.updated_props: + iter435.write(oprot) oprot.writeListEnd() oprot.writeFieldEnd() if self.insertable != None and self.insertable != self.thrift_spec[5][4]: @@ -3855,8 +4128,8 @@ def write(self, oprot): if self.return_props != None: oprot.writeFieldBegin('return_props', TType.LIST, 6) oprot.writeListBegin(TType.STRING, len(self.return_props)) - for iter402 in self.return_props: - oprot.writeString(iter402) + for iter436 in self.return_props: + oprot.writeString(iter436) oprot.writeListEnd() oprot.writeFieldEnd() if self.condition != None: @@ -4410,17 +4683,17 @@ def read(self, iprot): elif fid == 3: if ftype == TType.LIST: self.column_hints = [] - (_etype406, _size403) = iprot.readListBegin() - if _size403 >= 0: - for _i407 in range(_size403): - _elem408 = IndexColumnHint() - _elem408.read(iprot) - self.column_hints.append(_elem408) + (_etype440, _size437) = iprot.readListBegin() + if _size437 >= 0: + for _i441 in range(_size437): + _elem442 = IndexColumnHint() + _elem442.read(iprot) + self.column_hints.append(_elem442) else: while iprot.peekList(): - _elem409 = IndexColumnHint() - _elem409.read(iprot) - self.column_hints.append(_elem409) + _elem443 = IndexColumnHint() + _elem443.read(iprot) + self.column_hints.append(_elem443) iprot.readListEnd() else: iprot.skip(ftype) @@ -4448,8 +4721,8 @@ def write(self, oprot): if self.column_hints != None: oprot.writeFieldBegin('column_hints', TType.LIST, 3) oprot.writeListBegin(TType.STRUCT, len(self.column_hints)) - for iter410 in self.column_hints: - iter410.write(oprot) + for iter444 in self.column_hints: + iter444.write(oprot) oprot.writeListEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -4514,17 +4787,17 @@ def read(self, iprot): if fid == 1: if ftype == TType.LIST: self.contexts = [] - (_etype414, _size411) = iprot.readListBegin() - if _size411 >= 0: - for _i415 in range(_size411): - _elem416 = IndexQueryContext() - _elem416.read(iprot) - self.contexts.append(_elem416) + (_etype448, _size445) = iprot.readListBegin() + if _size445 >= 0: + for _i449 in range(_size445): + _elem450 = IndexQueryContext() + _elem450.read(iprot) + self.contexts.append(_elem450) else: while iprot.peekList(): - _elem417 = IndexQueryContext() - _elem417.read(iprot) - self.contexts.append(_elem417) + _elem451 = IndexQueryContext() + _elem451.read(iprot) + self.contexts.append(_elem451) iprot.readListEnd() else: iprot.skip(ftype) @@ -4550,8 +4823,8 @@ def write(self, oprot): if self.contexts != None: oprot.writeFieldBegin('contexts', TType.LIST, 1) oprot.writeListBegin(TType.STRUCT, len(self.contexts)) - for iter418 in self.contexts: - iter418.write(oprot) + for iter452 in self.contexts: + iter452.write(oprot) oprot.writeListEnd() oprot.writeFieldEnd() if self.schema_id != None: @@ -4627,15 +4900,15 @@ def read(self, iprot): elif fid == 2: if ftype == TType.LIST: self.parts = [] - (_etype422, _size419) = iprot.readListBegin() - if _size419 >= 0: - for _i423 in range(_size419): - _elem424 = iprot.readI32() - self.parts.append(_elem424) + (_etype456, _size453) = iprot.readListBegin() + if _size453 >= 0: + for _i457 in range(_size453): + _elem458 = iprot.readI32() + self.parts.append(_elem458) else: while iprot.peekList(): - _elem425 = iprot.readI32() - self.parts.append(_elem425) + _elem459 = iprot.readI32() + self.parts.append(_elem459) iprot.readListEnd() else: iprot.skip(ftype) @@ -4648,15 +4921,15 @@ def read(self, iprot): elif fid == 4: if ftype == TType.LIST: self.return_columns = [] - (_etype429, _size426) = iprot.readListBegin() - if _size426 >= 0: - for _i430 in range(_size426): - _elem431 = iprot.readString() - self.return_columns.append(_elem431) + (_etype463, _size460) = iprot.readListBegin() + if _size460 >= 0: + for _i464 in range(_size460): + _elem465 = iprot.readString() + self.return_columns.append(_elem465) else: while iprot.peekList(): - _elem432 = iprot.readString() - self.return_columns.append(_elem432) + _elem466 = iprot.readString() + self.return_columns.append(_elem466) iprot.readListEnd() else: iprot.skip(ftype) @@ -4674,34 +4947,34 @@ def read(self, iprot): elif fid == 7: if ftype == TType.LIST: self.order_by = [] - (_etype436, _size433) = iprot.readListBegin() - if _size433 >= 0: - for _i437 in range(_size433): - _elem438 = OrderBy() - _elem438.read(iprot) - self.order_by.append(_elem438) + (_etype470, _size467) = iprot.readListBegin() + if _size467 >= 0: + for _i471 in range(_size467): + _elem472 = OrderBy() + _elem472.read(iprot) + self.order_by.append(_elem472) else: while iprot.peekList(): - _elem439 = OrderBy() - _elem439.read(iprot) - self.order_by.append(_elem439) + _elem473 = OrderBy() + _elem473.read(iprot) + self.order_by.append(_elem473) iprot.readListEnd() else: iprot.skip(ftype) elif fid == 8: if ftype == TType.LIST: self.stat_columns = [] - (_etype443, _size440) = iprot.readListBegin() - if _size440 >= 0: - for _i444 in range(_size440): - _elem445 = StatProp() - _elem445.read(iprot) - self.stat_columns.append(_elem445) + (_etype477, _size474) = iprot.readListBegin() + if _size474 >= 0: + for _i478 in range(_size474): + _elem479 = StatProp() + _elem479.read(iprot) + self.stat_columns.append(_elem479) else: while iprot.peekList(): - _elem446 = StatProp() - _elem446.read(iprot) - self.stat_columns.append(_elem446) + _elem480 = StatProp() + _elem480.read(iprot) + self.stat_columns.append(_elem480) iprot.readListEnd() else: iprot.skip(ftype) @@ -4725,8 +4998,8 @@ def write(self, oprot): if self.parts != None: oprot.writeFieldBegin('parts', TType.LIST, 2) oprot.writeListBegin(TType.I32, len(self.parts)) - for iter447 in self.parts: - oprot.writeI32(iter447) + for iter481 in self.parts: + oprot.writeI32(iter481) oprot.writeListEnd() oprot.writeFieldEnd() if self.indices != None: @@ -4736,8 +5009,8 @@ def write(self, oprot): if self.return_columns != None: oprot.writeFieldBegin('return_columns', TType.LIST, 4) oprot.writeListBegin(TType.STRING, len(self.return_columns)) - for iter448 in self.return_columns: - oprot.writeString(iter448) + for iter482 in self.return_columns: + oprot.writeString(iter482) oprot.writeListEnd() oprot.writeFieldEnd() if self.common != None: @@ -4751,15 +5024,15 @@ def write(self, oprot): if self.order_by != None: oprot.writeFieldBegin('order_by', TType.LIST, 7) oprot.writeListBegin(TType.STRUCT, len(self.order_by)) - for iter449 in self.order_by: - iter449.write(oprot) + for iter483 in self.order_by: + iter483.write(oprot) oprot.writeListEnd() oprot.writeFieldEnd() if self.stat_columns != None: oprot.writeFieldBegin('stat_columns', TType.LIST, 8) oprot.writeListBegin(TType.STRUCT, len(self.stat_columns)) - for iter450 in self.stat_columns: - iter450.write(oprot) + for iter484 in self.stat_columns: + iter484.write(oprot) oprot.writeListEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -4852,15 +5125,15 @@ def read(self, iprot): elif fid == 2: if ftype == TType.LIST: self.parts = [] - (_etype454, _size451) = iprot.readListBegin() - if _size451 >= 0: - for _i455 in range(_size451): - _elem456 = iprot.readI32() - self.parts.append(_elem456) + (_etype488, _size485) = iprot.readListBegin() + if _size485 >= 0: + for _i489 in range(_size485): + _elem490 = iprot.readI32() + self.parts.append(_elem490) else: while iprot.peekList(): - _elem457 = iprot.readI32() - self.parts.append(_elem457) + _elem491 = iprot.readI32() + self.parts.append(_elem491) iprot.readListEnd() else: iprot.skip(ftype) @@ -4902,8 +5175,8 @@ def write(self, oprot): if self.parts != None: oprot.writeFieldBegin('parts', TType.LIST, 2) oprot.writeListBegin(TType.I32, len(self.parts)) - for iter458 in self.parts: - oprot.writeI32(iter458) + for iter492 in self.parts: + oprot.writeI32(iter492) oprot.writeListEnd() oprot.writeFieldEnd() if self.indices != None: @@ -5073,36 +5346,36 @@ def read(self, iprot): elif fid == 2: if ftype == TType.MAP: self.parts = {} - (_ktype460, _vtype461, _size459 ) = iprot.readMapBegin() - if _size459 >= 0: - for _i463 in range(_size459): - _key464 = iprot.readI32() - _val465 = ScanCursor() - _val465.read(iprot) - self.parts[_key464] = _val465 + (_ktype494, _vtype495, _size493 ) = iprot.readMapBegin() + if _size493 >= 0: + for _i497 in range(_size493): + _key498 = iprot.readI32() + _val499 = ScanCursor() + _val499.read(iprot) + self.parts[_key498] = _val499 else: while iprot.peekMap(): - _key466 = iprot.readI32() - _val467 = ScanCursor() - _val467.read(iprot) - self.parts[_key466] = _val467 + _key500 = iprot.readI32() + _val501 = ScanCursor() + _val501.read(iprot) + self.parts[_key500] = _val501 iprot.readMapEnd() else: iprot.skip(ftype) elif fid == 3: if ftype == TType.LIST: self.return_columns = [] - (_etype471, _size468) = iprot.readListBegin() - if _size468 >= 0: - for _i472 in range(_size468): - _elem473 = VertexProp() - _elem473.read(iprot) - self.return_columns.append(_elem473) + (_etype505, _size502) = iprot.readListBegin() + if _size502 >= 0: + for _i506 in range(_size502): + _elem507 = VertexProp() + _elem507.read(iprot) + self.return_columns.append(_elem507) else: while iprot.peekList(): - _elem474 = VertexProp() - _elem474.read(iprot) - self.return_columns.append(_elem474) + _elem508 = VertexProp() + _elem508.read(iprot) + self.return_columns.append(_elem508) iprot.readListEnd() else: iprot.skip(ftype) @@ -5162,16 +5435,16 @@ def write(self, oprot): if self.parts != None: oprot.writeFieldBegin('parts', TType.MAP, 2) oprot.writeMapBegin(TType.I32, TType.STRUCT, len(self.parts)) - for kiter475,viter476 in self.parts.items(): - oprot.writeI32(kiter475) - viter476.write(oprot) + for kiter509,viter510 in self.parts.items(): + oprot.writeI32(kiter509) + viter510.write(oprot) oprot.writeMapEnd() oprot.writeFieldEnd() if self.return_columns != None: oprot.writeFieldBegin('return_columns', TType.LIST, 3) oprot.writeListBegin(TType.STRUCT, len(self.return_columns)) - for iter477 in self.return_columns: - iter477.write(oprot) + for iter511 in self.return_columns: + iter511.write(oprot) oprot.writeListEnd() oprot.writeFieldEnd() if self.limit != None: @@ -5305,36 +5578,36 @@ def read(self, iprot): elif fid == 2: if ftype == TType.MAP: self.parts = {} - (_ktype479, _vtype480, _size478 ) = iprot.readMapBegin() - if _size478 >= 0: - for _i482 in range(_size478): - _key483 = iprot.readI32() - _val484 = ScanCursor() - _val484.read(iprot) - self.parts[_key483] = _val484 + (_ktype513, _vtype514, _size512 ) = iprot.readMapBegin() + if _size512 >= 0: + for _i516 in range(_size512): + _key517 = iprot.readI32() + _val518 = ScanCursor() + _val518.read(iprot) + self.parts[_key517] = _val518 else: while iprot.peekMap(): - _key485 = iprot.readI32() - _val486 = ScanCursor() - _val486.read(iprot) - self.parts[_key485] = _val486 + _key519 = iprot.readI32() + _val520 = ScanCursor() + _val520.read(iprot) + self.parts[_key519] = _val520 iprot.readMapEnd() else: iprot.skip(ftype) elif fid == 3: if ftype == TType.LIST: self.return_columns = [] - (_etype490, _size487) = iprot.readListBegin() - if _size487 >= 0: - for _i491 in range(_size487): - _elem492 = EdgeProp() - _elem492.read(iprot) - self.return_columns.append(_elem492) + (_etype524, _size521) = iprot.readListBegin() + if _size521 >= 0: + for _i525 in range(_size521): + _elem526 = EdgeProp() + _elem526.read(iprot) + self.return_columns.append(_elem526) else: while iprot.peekList(): - _elem493 = EdgeProp() - _elem493.read(iprot) - self.return_columns.append(_elem493) + _elem527 = EdgeProp() + _elem527.read(iprot) + self.return_columns.append(_elem527) iprot.readListEnd() else: iprot.skip(ftype) @@ -5394,16 +5667,16 @@ def write(self, oprot): if self.parts != None: oprot.writeFieldBegin('parts', TType.MAP, 2) oprot.writeMapBegin(TType.I32, TType.STRUCT, len(self.parts)) - for kiter494,viter495 in self.parts.items(): - oprot.writeI32(kiter494) - viter495.write(oprot) + for kiter528,viter529 in self.parts.items(): + oprot.writeI32(kiter528) + viter529.write(oprot) oprot.writeMapEnd() oprot.writeFieldEnd() if self.return_columns != None: oprot.writeFieldBegin('return_columns', TType.LIST, 3) oprot.writeListBegin(TType.STRUCT, len(self.return_columns)) - for iter496 in self.return_columns: - iter496.write(oprot) + for iter530 in self.return_columns: + iter530.write(oprot) oprot.writeListEnd() oprot.writeFieldEnd() if self.limit != None: @@ -5537,19 +5810,19 @@ def read(self, iprot): elif fid == 3: if ftype == TType.MAP: self.cursors = {} - (_ktype498, _vtype499, _size497 ) = iprot.readMapBegin() - if _size497 >= 0: - for _i501 in range(_size497): - _key502 = iprot.readI32() - _val503 = ScanCursor() - _val503.read(iprot) - self.cursors[_key502] = _val503 + (_ktype532, _vtype533, _size531 ) = iprot.readMapBegin() + if _size531 >= 0: + for _i535 in range(_size531): + _key536 = iprot.readI32() + _val537 = ScanCursor() + _val537.read(iprot) + self.cursors[_key536] = _val537 else: while iprot.peekMap(): - _key504 = iprot.readI32() - _val505 = ScanCursor() - _val505.read(iprot) - self.cursors[_key504] = _val505 + _key538 = iprot.readI32() + _val539 = ScanCursor() + _val539.read(iprot) + self.cursors[_key538] = _val539 iprot.readMapEnd() else: iprot.skip(ftype) @@ -5577,9 +5850,9 @@ def write(self, oprot): if self.cursors != None: oprot.writeFieldBegin('cursors', TType.MAP, 3) oprot.writeMapBegin(TType.I32, TType.STRUCT, len(self.cursors)) - for kiter506,viter507 in self.cursors.items(): - oprot.writeI32(kiter506) - viter507.write(oprot) + for kiter540,viter541 in self.cursors.items(): + oprot.writeI32(kiter540) + viter541.write(oprot) oprot.writeMapEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -5650,30 +5923,30 @@ def read(self, iprot): elif fid == 2: if ftype == TType.LIST: self.parts = [] - (_etype511, _size508) = iprot.readListBegin() - if _size508 >= 0: - for _i512 in range(_size508): - _elem513 = iprot.readI32() - self.parts.append(_elem513) + (_etype545, _size542) = iprot.readListBegin() + if _size542 >= 0: + for _i546 in range(_size542): + _elem547 = iprot.readI32() + self.parts.append(_elem547) else: while iprot.peekList(): - _elem514 = iprot.readI32() - self.parts.append(_elem514) + _elem548 = iprot.readI32() + self.parts.append(_elem548) iprot.readListEnd() else: iprot.skip(ftype) elif fid == 3: if ftype == TType.LIST: self.task_specific_paras = [] - (_etype518, _size515) = iprot.readListBegin() - if _size515 >= 0: - for _i519 in range(_size515): - _elem520 = iprot.readString() - self.task_specific_paras.append(_elem520) + (_etype552, _size549) = iprot.readListBegin() + if _size549 >= 0: + for _i553 in range(_size549): + _elem554 = iprot.readString() + self.task_specific_paras.append(_elem554) else: while iprot.peekList(): - _elem521 = iprot.readString() - self.task_specific_paras.append(_elem521) + _elem555 = iprot.readString() + self.task_specific_paras.append(_elem555) iprot.readListEnd() else: iprot.skip(ftype) @@ -5697,15 +5970,15 @@ def write(self, oprot): if self.parts != None: oprot.writeFieldBegin('parts', TType.LIST, 2) oprot.writeListBegin(TType.I32, len(self.parts)) - for iter522 in self.parts: - oprot.writeI32(iter522) + for iter556 in self.parts: + oprot.writeI32(iter556) oprot.writeListEnd() oprot.writeFieldEnd() if self.task_specific_paras != None: oprot.writeFieldBegin('task_specific_paras', TType.LIST, 3) oprot.writeListBegin(TType.STRING, len(self.task_specific_paras)) - for iter523 in self.task_specific_paras: - oprot.writeString(iter523) + for iter557 in self.task_specific_paras: + oprot.writeString(iter557) oprot.writeListEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -5776,37 +6049,37 @@ def read(self, iprot): elif fid == 2: if ftype == TType.MAP: self.parts = {} - (_ktype525, _vtype526, _size524 ) = iprot.readMapBegin() - if _size524 >= 0: - for _i528 in range(_size524): - _key529 = iprot.readI32() - _val530 = [] - (_etype534, _size531) = iprot.readListBegin() - if _size531 >= 0: - for _i535 in range(_size531): - _elem536 = iprot.readString() - _val530.append(_elem536) + (_ktype559, _vtype560, _size558 ) = iprot.readMapBegin() + if _size558 >= 0: + for _i562 in range(_size558): + _key563 = iprot.readI32() + _val564 = [] + (_etype568, _size565) = iprot.readListBegin() + if _size565 >= 0: + for _i569 in range(_size565): + _elem570 = iprot.readString() + _val564.append(_elem570) else: while iprot.peekList(): - _elem537 = iprot.readString() - _val530.append(_elem537) + _elem571 = iprot.readString() + _val564.append(_elem571) iprot.readListEnd() - self.parts[_key529] = _val530 + self.parts[_key563] = _val564 else: while iprot.peekMap(): - _key538 = iprot.readI32() - _val539 = [] - (_etype543, _size540) = iprot.readListBegin() - if _size540 >= 0: - for _i544 in range(_size540): - _elem545 = iprot.readString() - _val539.append(_elem545) + _key572 = iprot.readI32() + _val573 = [] + (_etype577, _size574) = iprot.readListBegin() + if _size574 >= 0: + for _i578 in range(_size574): + _elem579 = iprot.readString() + _val573.append(_elem579) else: while iprot.peekList(): - _elem546 = iprot.readString() - _val539.append(_elem546) + _elem580 = iprot.readString() + _val573.append(_elem580) iprot.readListEnd() - self.parts[_key538] = _val539 + self.parts[_key572] = _val573 iprot.readMapEnd() else: iprot.skip(ftype) @@ -5835,11 +6108,11 @@ def write(self, oprot): if self.parts != None: oprot.writeFieldBegin('parts', TType.MAP, 2) oprot.writeMapBegin(TType.I32, TType.LIST, len(self.parts)) - for kiter547,viter548 in self.parts.items(): - oprot.writeI32(kiter547) - oprot.writeListBegin(TType.STRING, len(viter548)) - for iter549 in viter548: - oprot.writeString(iter549) + for kiter581,viter582 in self.parts.items(): + oprot.writeI32(kiter581) + oprot.writeListBegin(TType.STRING, len(viter582)) + for iter583 in viter582: + oprot.writeString(iter583) oprot.writeListEnd() oprot.writeMapEnd() oprot.writeFieldEnd() @@ -5915,17 +6188,17 @@ def read(self, iprot): elif fid == 2: if ftype == TType.MAP: self.key_values = {} - (_ktype551, _vtype552, _size550 ) = iprot.readMapBegin() - if _size550 >= 0: - for _i554 in range(_size550): - _key555 = iprot.readString() - _val556 = iprot.readString() - self.key_values[_key555] = _val556 + (_ktype585, _vtype586, _size584 ) = iprot.readMapBegin() + if _size584 >= 0: + for _i588 in range(_size584): + _key589 = iprot.readString() + _val590 = iprot.readString() + self.key_values[_key589] = _val590 else: while iprot.peekMap(): - _key557 = iprot.readString() - _val558 = iprot.readString() - self.key_values[_key557] = _val558 + _key591 = iprot.readString() + _val592 = iprot.readString() + self.key_values[_key591] = _val592 iprot.readMapEnd() else: iprot.skip(ftype) @@ -5949,9 +6222,9 @@ def write(self, oprot): if self.key_values != None: oprot.writeFieldBegin('key_values', TType.MAP, 2) oprot.writeMapBegin(TType.STRING, TType.STRING, len(self.key_values)) - for kiter559,viter560 in self.key_values.items(): - oprot.writeString(kiter559) - oprot.writeString(viter560) + for kiter593,viter594 in self.key_values.items(): + oprot.writeString(kiter593) + oprot.writeString(viter594) oprot.writeMapEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -6017,41 +6290,41 @@ def read(self, iprot): elif fid == 2: if ftype == TType.MAP: self.parts = {} - (_ktype562, _vtype563, _size561 ) = iprot.readMapBegin() - if _size561 >= 0: - for _i565 in range(_size561): - _key566 = iprot.readI32() - _val567 = [] - (_etype571, _size568) = iprot.readListBegin() - if _size568 >= 0: - for _i572 in range(_size568): - _elem573 = nebula3.common.ttypes.KeyValue() - _elem573.read(iprot) - _val567.append(_elem573) + (_ktype596, _vtype597, _size595 ) = iprot.readMapBegin() + if _size595 >= 0: + for _i599 in range(_size595): + _key600 = iprot.readI32() + _val601 = [] + (_etype605, _size602) = iprot.readListBegin() + if _size602 >= 0: + for _i606 in range(_size602): + _elem607 = nebula3.common.ttypes.KeyValue() + _elem607.read(iprot) + _val601.append(_elem607) else: while iprot.peekList(): - _elem574 = nebula3.common.ttypes.KeyValue() - _elem574.read(iprot) - _val567.append(_elem574) + _elem608 = nebula3.common.ttypes.KeyValue() + _elem608.read(iprot) + _val601.append(_elem608) iprot.readListEnd() - self.parts[_key566] = _val567 + self.parts[_key600] = _val601 else: while iprot.peekMap(): - _key575 = iprot.readI32() - _val576 = [] - (_etype580, _size577) = iprot.readListBegin() - if _size577 >= 0: - for _i581 in range(_size577): - _elem582 = nebula3.common.ttypes.KeyValue() - _elem582.read(iprot) - _val576.append(_elem582) + _key609 = iprot.readI32() + _val610 = [] + (_etype614, _size611) = iprot.readListBegin() + if _size611 >= 0: + for _i615 in range(_size611): + _elem616 = nebula3.common.ttypes.KeyValue() + _elem616.read(iprot) + _val610.append(_elem616) else: while iprot.peekList(): - _elem583 = nebula3.common.ttypes.KeyValue() - _elem583.read(iprot) - _val576.append(_elem583) + _elem617 = nebula3.common.ttypes.KeyValue() + _elem617.read(iprot) + _val610.append(_elem617) iprot.readListEnd() - self.parts[_key575] = _val576 + self.parts[_key609] = _val610 iprot.readMapEnd() else: iprot.skip(ftype) @@ -6075,11 +6348,11 @@ def write(self, oprot): if self.parts != None: oprot.writeFieldBegin('parts', TType.MAP, 2) oprot.writeMapBegin(TType.I32, TType.LIST, len(self.parts)) - for kiter584,viter585 in self.parts.items(): - oprot.writeI32(kiter584) - oprot.writeListBegin(TType.STRUCT, len(viter585)) - for iter586 in viter585: - iter586.write(oprot) + for kiter618,viter619 in self.parts.items(): + oprot.writeI32(kiter618) + oprot.writeListBegin(TType.STRUCT, len(viter619)) + for iter620 in viter619: + iter620.write(oprot) oprot.writeListEnd() oprot.writeMapEnd() oprot.writeFieldEnd() @@ -6146,37 +6419,37 @@ def read(self, iprot): elif fid == 2: if ftype == TType.MAP: self.parts = {} - (_ktype588, _vtype589, _size587 ) = iprot.readMapBegin() - if _size587 >= 0: - for _i591 in range(_size587): - _key592 = iprot.readI32() - _val593 = [] - (_etype597, _size594) = iprot.readListBegin() - if _size594 >= 0: - for _i598 in range(_size594): - _elem599 = iprot.readString() - _val593.append(_elem599) + (_ktype622, _vtype623, _size621 ) = iprot.readMapBegin() + if _size621 >= 0: + for _i625 in range(_size621): + _key626 = iprot.readI32() + _val627 = [] + (_etype631, _size628) = iprot.readListBegin() + if _size628 >= 0: + for _i632 in range(_size628): + _elem633 = iprot.readString() + _val627.append(_elem633) else: while iprot.peekList(): - _elem600 = iprot.readString() - _val593.append(_elem600) + _elem634 = iprot.readString() + _val627.append(_elem634) iprot.readListEnd() - self.parts[_key592] = _val593 + self.parts[_key626] = _val627 else: while iprot.peekMap(): - _key601 = iprot.readI32() - _val602 = [] - (_etype606, _size603) = iprot.readListBegin() - if _size603 >= 0: - for _i607 in range(_size603): - _elem608 = iprot.readString() - _val602.append(_elem608) + _key635 = iprot.readI32() + _val636 = [] + (_etype640, _size637) = iprot.readListBegin() + if _size637 >= 0: + for _i641 in range(_size637): + _elem642 = iprot.readString() + _val636.append(_elem642) else: while iprot.peekList(): - _elem609 = iprot.readString() - _val602.append(_elem609) + _elem643 = iprot.readString() + _val636.append(_elem643) iprot.readListEnd() - self.parts[_key601] = _val602 + self.parts[_key635] = _val636 iprot.readMapEnd() else: iprot.skip(ftype) @@ -6200,11 +6473,11 @@ def write(self, oprot): if self.parts != None: oprot.writeFieldBegin('parts', TType.MAP, 2) oprot.writeMapBegin(TType.I32, TType.LIST, len(self.parts)) - for kiter610,viter611 in self.parts.items(): - oprot.writeI32(kiter610) - oprot.writeListBegin(TType.STRING, len(viter611)) - for iter612 in viter611: - oprot.writeString(iter612) + for kiter644,viter645 in self.parts.items(): + oprot.writeI32(kiter644) + oprot.writeListBegin(TType.STRING, len(viter645)) + for iter646 in viter645: + oprot.writeString(iter646) oprot.writeListEnd() oprot.writeMapEnd() oprot.writeFieldEnd() @@ -6472,17 +6745,17 @@ def read(self, iprot): elif fid == 4: if ftype == TType.LIST: self.peers = [] - (_etype616, _size613) = iprot.readListBegin() - if _size613 >= 0: - for _i617 in range(_size613): - _elem618 = nebula3.common.ttypes.HostAddr() - _elem618.read(iprot) - self.peers.append(_elem618) + (_etype650, _size647) = iprot.readListBegin() + if _size647 >= 0: + for _i651 in range(_size647): + _elem652 = nebula3.common.ttypes.HostAddr() + _elem652.read(iprot) + self.peers.append(_elem652) else: while iprot.peekList(): - _elem619 = nebula3.common.ttypes.HostAddr() - _elem619.read(iprot) - self.peers.append(_elem619) + _elem653 = nebula3.common.ttypes.HostAddr() + _elem653.read(iprot) + self.peers.append(_elem653) iprot.readListEnd() else: iprot.skip(ftype) @@ -6514,8 +6787,8 @@ def write(self, oprot): if self.peers != None: oprot.writeFieldBegin('peers', TType.LIST, 4) oprot.writeListBegin(TType.STRUCT, len(self.peers)) - for iter620 in self.peers: - iter620.write(oprot) + for iter654 in self.peers: + iter654.write(oprot) oprot.writeListEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -7041,15 +7314,15 @@ def read(self, iprot): if fid == 1: if ftype == TType.LIST: self.space_ids = [] - (_etype624, _size621) = iprot.readListBegin() - if _size621 >= 0: - for _i625 in range(_size621): - _elem626 = iprot.readI32() - self.space_ids.append(_elem626) + (_etype658, _size655) = iprot.readListBegin() + if _size655 >= 0: + for _i659 in range(_size655): + _elem660 = iprot.readI32() + self.space_ids.append(_elem660) else: while iprot.peekList(): - _elem627 = iprot.readI32() - self.space_ids.append(_elem627) + _elem661 = iprot.readI32() + self.space_ids.append(_elem661) iprot.readListEnd() else: iprot.skip(ftype) @@ -7074,8 +7347,8 @@ def write(self, oprot): if self.space_ids != None: oprot.writeFieldBegin('space_ids', TType.LIST, 1) oprot.writeListBegin(TType.I32, len(self.space_ids)) - for iter628 in self.space_ids: - oprot.writeI32(iter628) + for iter662 in self.space_ids: + oprot.writeI32(iter662) oprot.writeListEnd() oprot.writeFieldEnd() if self.name != None: @@ -7145,17 +7418,17 @@ def read(self, iprot): elif fid == 2: if ftype == TType.LIST: self.info = [] - (_etype632, _size629) = iprot.readListBegin() - if _size629 >= 0: - for _i633 in range(_size629): - _elem634 = nebula3.common.ttypes.CheckpointInfo() - _elem634.read(iprot) - self.info.append(_elem634) + (_etype666, _size663) = iprot.readListBegin() + if _size663 >= 0: + for _i667 in range(_size663): + _elem668 = nebula3.common.ttypes.CheckpointInfo() + _elem668.read(iprot) + self.info.append(_elem668) else: while iprot.peekList(): - _elem635 = nebula3.common.ttypes.CheckpointInfo() - _elem635.read(iprot) - self.info.append(_elem635) + _elem669 = nebula3.common.ttypes.CheckpointInfo() + _elem669.read(iprot) + self.info.append(_elem669) iprot.readListEnd() else: iprot.skip(ftype) @@ -7179,8 +7452,8 @@ def write(self, oprot): if self.info != None: oprot.writeFieldBegin('info', TType.LIST, 2) oprot.writeListBegin(TType.STRUCT, len(self.info)) - for iter636 in self.info: - iter636.write(oprot) + for iter670 in self.info: + iter670.write(oprot) oprot.writeListEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -7241,15 +7514,15 @@ def read(self, iprot): if fid == 1: if ftype == TType.LIST: self.space_ids = [] - (_etype640, _size637) = iprot.readListBegin() - if _size637 >= 0: - for _i641 in range(_size637): - _elem642 = iprot.readI32() - self.space_ids.append(_elem642) + (_etype674, _size671) = iprot.readListBegin() + if _size671 >= 0: + for _i675 in range(_size671): + _elem676 = iprot.readI32() + self.space_ids.append(_elem676) else: while iprot.peekList(): - _elem643 = iprot.readI32() - self.space_ids.append(_elem643) + _elem677 = iprot.readI32() + self.space_ids.append(_elem677) iprot.readListEnd() else: iprot.skip(ftype) @@ -7274,8 +7547,8 @@ def write(self, oprot): if self.space_ids != None: oprot.writeFieldBegin('space_ids', TType.LIST, 1) oprot.writeListBegin(TType.I32, len(self.space_ids)) - for iter644 in self.space_ids: - oprot.writeI32(iter644) + for iter678 in self.space_ids: + oprot.writeI32(iter678) oprot.writeListEnd() oprot.writeFieldEnd() if self.name != None: @@ -7412,15 +7685,15 @@ def read(self, iprot): if fid == 1: if ftype == TType.LIST: self.space_ids = [] - (_etype648, _size645) = iprot.readListBegin() - if _size645 >= 0: - for _i649 in range(_size645): - _elem650 = iprot.readI32() - self.space_ids.append(_elem650) + (_etype682, _size679) = iprot.readListBegin() + if _size679 >= 0: + for _i683 in range(_size679): + _elem684 = iprot.readI32() + self.space_ids.append(_elem684) else: while iprot.peekList(): - _elem651 = iprot.readI32() - self.space_ids.append(_elem651) + _elem685 = iprot.readI32() + self.space_ids.append(_elem685) iprot.readListEnd() else: iprot.skip(ftype) @@ -7445,8 +7718,8 @@ def write(self, oprot): if self.space_ids != None: oprot.writeFieldBegin('space_ids', TType.LIST, 1) oprot.writeListBegin(TType.I32, len(self.space_ids)) - for iter652 in self.space_ids: - oprot.writeI32(iter652) + for iter686 in self.space_ids: + oprot.writeI32(iter686) oprot.writeListEnd() oprot.writeFieldEnd() if self.sign != None: @@ -7588,37 +7861,37 @@ def read(self, iprot): elif fid == 2: if ftype == TType.MAP: self.leader_parts = {} - (_ktype654, _vtype655, _size653 ) = iprot.readMapBegin() - if _size653 >= 0: - for _i657 in range(_size653): - _key658 = iprot.readI32() - _val659 = [] - (_etype663, _size660) = iprot.readListBegin() - if _size660 >= 0: - for _i664 in range(_size660): - _elem665 = iprot.readI32() - _val659.append(_elem665) + (_ktype688, _vtype689, _size687 ) = iprot.readMapBegin() + if _size687 >= 0: + for _i691 in range(_size687): + _key692 = iprot.readI32() + _val693 = [] + (_etype697, _size694) = iprot.readListBegin() + if _size694 >= 0: + for _i698 in range(_size694): + _elem699 = iprot.readI32() + _val693.append(_elem699) else: while iprot.peekList(): - _elem666 = iprot.readI32() - _val659.append(_elem666) + _elem700 = iprot.readI32() + _val693.append(_elem700) iprot.readListEnd() - self.leader_parts[_key658] = _val659 + self.leader_parts[_key692] = _val693 else: while iprot.peekMap(): - _key667 = iprot.readI32() - _val668 = [] - (_etype672, _size669) = iprot.readListBegin() - if _size669 >= 0: - for _i673 in range(_size669): - _elem674 = iprot.readI32() - _val668.append(_elem674) + _key701 = iprot.readI32() + _val702 = [] + (_etype706, _size703) = iprot.readListBegin() + if _size703 >= 0: + for _i707 in range(_size703): + _elem708 = iprot.readI32() + _val702.append(_elem708) else: while iprot.peekList(): - _elem675 = iprot.readI32() - _val668.append(_elem675) + _elem709 = iprot.readI32() + _val702.append(_elem709) iprot.readListEnd() - self.leader_parts[_key667] = _val668 + self.leader_parts[_key701] = _val702 iprot.readMapEnd() else: iprot.skip(ftype) @@ -7642,11 +7915,11 @@ def write(self, oprot): if self.leader_parts != None: oprot.writeFieldBegin('leader_parts', TType.MAP, 2) oprot.writeMapBegin(TType.I32, TType.LIST, len(self.leader_parts)) - for kiter676,viter677 in self.leader_parts.items(): - oprot.writeI32(kiter676) - oprot.writeListBegin(TType.I32, len(viter677)) - for iter678 in viter677: - oprot.writeI32(iter678) + for kiter710,viter711 in self.leader_parts.items(): + oprot.writeI32(kiter710) + oprot.writeListBegin(TType.I32, len(viter711)) + for iter712 in viter711: + oprot.writeI32(iter712) oprot.writeListEnd() oprot.writeMapEnd() oprot.writeFieldEnd() @@ -7719,17 +7992,17 @@ def read(self, iprot): elif fid == 3: if ftype == TType.LIST: self.peers = [] - (_etype682, _size679) = iprot.readListBegin() - if _size679 >= 0: - for _i683 in range(_size679): - _elem684 = nebula3.common.ttypes.HostAddr() - _elem684.read(iprot) - self.peers.append(_elem684) + (_etype716, _size713) = iprot.readListBegin() + if _size713 >= 0: + for _i717 in range(_size713): + _elem718 = nebula3.common.ttypes.HostAddr() + _elem718.read(iprot) + self.peers.append(_elem718) else: while iprot.peekList(): - _elem685 = nebula3.common.ttypes.HostAddr() - _elem685.read(iprot) - self.peers.append(_elem685) + _elem719 = nebula3.common.ttypes.HostAddr() + _elem719.read(iprot) + self.peers.append(_elem719) iprot.readListEnd() else: iprot.skip(ftype) @@ -7757,8 +8030,8 @@ def write(self, oprot): if self.peers != None: oprot.writeFieldBegin('peers', TType.LIST, 3) oprot.writeListBegin(TType.STRUCT, len(self.peers)) - for iter686 in self.peers: - iter686.write(oprot) + for iter720 in self.peers: + iter720.write(oprot) oprot.writeListEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -7829,15 +8102,15 @@ def read(self, iprot): elif fid == 2: if ftype == TType.LIST: self.parts = [] - (_etype690, _size687) = iprot.readListBegin() - if _size687 >= 0: - for _i691 in range(_size687): - _elem692 = iprot.readI32() - self.parts.append(_elem692) + (_etype724, _size721) = iprot.readListBegin() + if _size721 >= 0: + for _i725 in range(_size721): + _elem726 = iprot.readI32() + self.parts.append(_elem726) else: while iprot.peekList(): - _elem693 = iprot.readI32() - self.parts.append(_elem693) + _elem727 = iprot.readI32() + self.parts.append(_elem727) iprot.readListEnd() else: iprot.skip(ftype) @@ -7866,8 +8139,8 @@ def write(self, oprot): if self.parts != None: oprot.writeFieldBegin('parts', TType.LIST, 2) oprot.writeListBegin(TType.I32, len(self.parts)) - for iter694 in self.parts: - oprot.writeI32(iter694) + for iter728 in self.parts: + oprot.writeI32(iter728) oprot.writeListEnd() oprot.writeFieldEnd() if self.index_id != None: @@ -8576,56 +8849,56 @@ def read(self, iprot): elif fid == 2: if ftype == TType.MAP: self.parts = {} - (_ktype696, _vtype697, _size695 ) = iprot.readMapBegin() - if _size695 >= 0: - for _i699 in range(_size695): - _key700 = iprot.readI32() - _val701 = [] - (_etype705, _size702) = iprot.readListBegin() - if _size702 >= 0: - for _i706 in range(_size702): - _elem707 = NewEdge() - _elem707.read(iprot) - _val701.append(_elem707) + (_ktype730, _vtype731, _size729 ) = iprot.readMapBegin() + if _size729 >= 0: + for _i733 in range(_size729): + _key734 = iprot.readI32() + _val735 = [] + (_etype739, _size736) = iprot.readListBegin() + if _size736 >= 0: + for _i740 in range(_size736): + _elem741 = NewEdge() + _elem741.read(iprot) + _val735.append(_elem741) else: while iprot.peekList(): - _elem708 = NewEdge() - _elem708.read(iprot) - _val701.append(_elem708) + _elem742 = NewEdge() + _elem742.read(iprot) + _val735.append(_elem742) iprot.readListEnd() - self.parts[_key700] = _val701 + self.parts[_key734] = _val735 else: while iprot.peekMap(): - _key709 = iprot.readI32() - _val710 = [] - (_etype714, _size711) = iprot.readListBegin() - if _size711 >= 0: - for _i715 in range(_size711): - _elem716 = NewEdge() - _elem716.read(iprot) - _val710.append(_elem716) + _key743 = iprot.readI32() + _val744 = [] + (_etype748, _size745) = iprot.readListBegin() + if _size745 >= 0: + for _i749 in range(_size745): + _elem750 = NewEdge() + _elem750.read(iprot) + _val744.append(_elem750) else: while iprot.peekList(): - _elem717 = NewEdge() - _elem717.read(iprot) - _val710.append(_elem717) + _elem751 = NewEdge() + _elem751.read(iprot) + _val744.append(_elem751) iprot.readListEnd() - self.parts[_key709] = _val710 + self.parts[_key743] = _val744 iprot.readMapEnd() else: iprot.skip(ftype) elif fid == 3: if ftype == TType.LIST: self.prop_names = [] - (_etype721, _size718) = iprot.readListBegin() - if _size718 >= 0: - for _i722 in range(_size718): - _elem723 = iprot.readString() - self.prop_names.append(_elem723) + (_etype755, _size752) = iprot.readListBegin() + if _size752 >= 0: + for _i756 in range(_size752): + _elem757 = iprot.readString() + self.prop_names.append(_elem757) else: while iprot.peekList(): - _elem724 = iprot.readString() - self.prop_names.append(_elem724) + _elem758 = iprot.readString() + self.prop_names.append(_elem758) iprot.readListEnd() else: iprot.skip(ftype) @@ -8664,19 +8937,19 @@ def write(self, oprot): if self.parts != None: oprot.writeFieldBegin('parts', TType.MAP, 2) oprot.writeMapBegin(TType.I32, TType.LIST, len(self.parts)) - for kiter725,viter726 in self.parts.items(): - oprot.writeI32(kiter725) - oprot.writeListBegin(TType.STRUCT, len(viter726)) - for iter727 in viter726: - iter727.write(oprot) + for kiter759,viter760 in self.parts.items(): + oprot.writeI32(kiter759) + oprot.writeListBegin(TType.STRUCT, len(viter760)) + for iter761 in viter760: + iter761.write(oprot) oprot.writeListEnd() oprot.writeMapEnd() oprot.writeFieldEnd() if self.prop_names != None: oprot.writeFieldBegin('prop_names', TType.LIST, 3) oprot.writeListBegin(TType.STRING, len(self.prop_names)) - for iter728 in self.prop_names: - oprot.writeString(iter728) + for iter762 in self.prop_names: + oprot.writeString(iter762) oprot.writeListEnd() oprot.writeFieldEnd() if self.if_not_exists != None: @@ -8789,15 +9062,15 @@ def read(self, iprot): elif fid == 5: if ftype == TType.LIST: self.parts = [] - (_etype732, _size729) = iprot.readListBegin() - if _size729 >= 0: - for _i733 in range(_size729): - _elem734 = iprot.readI32() - self.parts.append(_elem734) + (_etype766, _size763) = iprot.readListBegin() + if _size763 >= 0: + for _i767 in range(_size763): + _elem768 = iprot.readI32() + self.parts.append(_elem768) else: while iprot.peekList(): - _elem735 = iprot.readI32() - self.parts.append(_elem735) + _elem769 = iprot.readI32() + self.parts.append(_elem769) iprot.readListEnd() else: iprot.skip(ftype) @@ -8833,8 +9106,8 @@ def write(self, oprot): if self.parts != None: oprot.writeFieldBegin('parts', TType.LIST, 5) oprot.writeListBegin(TType.I32, len(self.parts)) - for iter736 in self.parts: - oprot.writeI32(iter736) + for iter770 in self.parts: + oprot.writeI32(iter770) oprot.writeListEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -8914,41 +9187,41 @@ def read(self, iprot): elif fid == 2: if ftype == TType.MAP: self.parts = {} - (_ktype738, _vtype739, _size737 ) = iprot.readMapBegin() - if _size737 >= 0: - for _i741 in range(_size737): - _key742 = iprot.readI32() - _val743 = [] - (_etype747, _size744) = iprot.readListBegin() - if _size744 >= 0: - for _i748 in range(_size744): - _elem749 = EdgeKey() - _elem749.read(iprot) - _val743.append(_elem749) + (_ktype772, _vtype773, _size771 ) = iprot.readMapBegin() + if _size771 >= 0: + for _i775 in range(_size771): + _key776 = iprot.readI32() + _val777 = [] + (_etype781, _size778) = iprot.readListBegin() + if _size778 >= 0: + for _i782 in range(_size778): + _elem783 = EdgeKey() + _elem783.read(iprot) + _val777.append(_elem783) else: while iprot.peekList(): - _elem750 = EdgeKey() - _elem750.read(iprot) - _val743.append(_elem750) + _elem784 = EdgeKey() + _elem784.read(iprot) + _val777.append(_elem784) iprot.readListEnd() - self.parts[_key742] = _val743 + self.parts[_key776] = _val777 else: while iprot.peekMap(): - _key751 = iprot.readI32() - _val752 = [] - (_etype756, _size753) = iprot.readListBegin() - if _size753 >= 0: - for _i757 in range(_size753): - _elem758 = EdgeKey() - _elem758.read(iprot) - _val752.append(_elem758) + _key785 = iprot.readI32() + _val786 = [] + (_etype790, _size787) = iprot.readListBegin() + if _size787 >= 0: + for _i791 in range(_size787): + _elem792 = EdgeKey() + _elem792.read(iprot) + _val786.append(_elem792) else: while iprot.peekList(): - _elem759 = EdgeKey() - _elem759.read(iprot) - _val752.append(_elem759) + _elem793 = EdgeKey() + _elem793.read(iprot) + _val786.append(_elem793) iprot.readListEnd() - self.parts[_key751] = _val752 + self.parts[_key785] = _val786 iprot.readMapEnd() else: iprot.skip(ftype) @@ -8982,11 +9255,11 @@ def write(self, oprot): if self.parts != None: oprot.writeFieldBegin('parts', TType.MAP, 2) oprot.writeMapBegin(TType.I32, TType.LIST, len(self.parts)) - for kiter760,viter761 in self.parts.items(): - oprot.writeI32(kiter760) - oprot.writeListBegin(TType.STRUCT, len(viter761)) - for iter762 in viter761: - iter762.write(oprot) + for kiter794,viter795 in self.parts.items(): + oprot.writeI32(kiter794) + oprot.writeListBegin(TType.STRUCT, len(viter795)) + for iter796 in viter795: + iter796.write(oprot) oprot.writeListEnd() oprot.writeMapEnd() oprot.writeFieldEnd() @@ -9268,6 +9541,7 @@ def OrderBy__setstate__(self, state): (9, TType.BOOL, 'random', None, None, 1, ), # 9 (10, TType.I64, 'limit', None, None, 1, ), # 10 (11, TType.STRING, 'filter', False, None, 1, ), # 11 + (12, TType.STRING, 'tag_filter', False, None, 1, ), # 12 ) TraverseSpec.thrift_struct_annotations = { @@ -9275,7 +9549,7 @@ def OrderBy__setstate__(self, state): TraverseSpec.thrift_field_annotations = { } -def TraverseSpec__init__(self, edge_types=None, edge_direction=TraverseSpec.thrift_spec[2][4], dedup=TraverseSpec.thrift_spec[3][4], stat_props=None, vertex_props=None, edge_props=None, expressions=None, order_by=None, random=None, limit=None, filter=None,): +def TraverseSpec__init__(self, edge_types=None, edge_direction=TraverseSpec.thrift_spec[2][4], dedup=TraverseSpec.thrift_spec[3][4], stat_props=None, vertex_props=None, edge_props=None, expressions=None, order_by=None, random=None, limit=None, filter=None, tag_filter=None,): self.edge_types = edge_types self.edge_direction = edge_direction self.dedup = dedup @@ -9287,6 +9561,7 @@ def TraverseSpec__init__(self, edge_types=None, edge_direction=TraverseSpec.thri self.random = random self.limit = limit self.filter = filter + self.tag_filter = tag_filter TraverseSpec.__init__ = TraverseSpec__init__ @@ -9302,6 +9577,7 @@ def TraverseSpec__setstate__(self, state): state.setdefault('random', None) state.setdefault('limit', None) state.setdefault('filter', None) + state.setdefault('tag_filter', None) self.__dict__ = state TraverseSpec.__getstate__ = lambda self: self.__dict__.copy() @@ -9312,7 +9588,7 @@ def TraverseSpec__setstate__(self, state): None, # 0 (1, TType.I32, 'space_id', None, None, 2, ), # 1 (2, TType.LIST, 'column_names', (TType.STRING,False), None, 2, ), # 2 - (3, TType.MAP, 'parts', (TType.I32,None,TType.LIST,(TType.STRUCT,[nebula3.common.ttypes.Row, nebula3.common.ttypes.Row.thrift_spec, False])), None, 2, ), # 3 + (3, TType.MAP, 'parts', (TType.I32,None,TType.LIST,(TType.STRUCT,[nebula3.common.ttypes.Value, nebula3.common.ttypes.Value.thrift_spec, True])), None, 2, ), # 3 (4, TType.STRUCT, 'traverse_spec', [TraverseSpec, TraverseSpec.thrift_spec, False], None, 2, ), # 4 (5, TType.STRUCT, 'common', [RequestCommon, RequestCommon.thrift_spec, False], None, 1, ), # 5 ) @@ -9368,6 +9644,64 @@ def GetNeighborsResponse__setstate__(self, state): GetNeighborsResponse.__getstate__ = lambda self: self.__dict__.copy() GetNeighborsResponse.__setstate__ = GetNeighborsResponse__setstate__ +all_structs.append(GetDstBySrcRequest) +GetDstBySrcRequest.thrift_spec = ( + None, # 0 + (1, TType.I32, 'space_id', None, None, 2, ), # 1 + (2, TType.MAP, 'parts', (TType.I32,None,TType.LIST,(TType.STRUCT,[nebula3.common.ttypes.Value, nebula3.common.ttypes.Value.thrift_spec, True])), None, 2, ), # 2 + (3, TType.LIST, 'edge_types', (TType.I32,None), None, 2, ), # 3 + (4, TType.STRUCT, 'common', [RequestCommon, RequestCommon.thrift_spec, False], None, 1, ), # 4 +) + +GetDstBySrcRequest.thrift_struct_annotations = { +} +GetDstBySrcRequest.thrift_field_annotations = { +} + +def GetDstBySrcRequest__init__(self, space_id=None, parts=None, edge_types=None, common=None,): + self.space_id = space_id + self.parts = parts + self.edge_types = edge_types + self.common = common + +GetDstBySrcRequest.__init__ = GetDstBySrcRequest__init__ + +def GetDstBySrcRequest__setstate__(self, state): + state.setdefault('space_id', None) + state.setdefault('parts', None) + state.setdefault('edge_types', None) + state.setdefault('common', None) + self.__dict__ = state + +GetDstBySrcRequest.__getstate__ = lambda self: self.__dict__.copy() +GetDstBySrcRequest.__setstate__ = GetDstBySrcRequest__setstate__ + +all_structs.append(GetDstBySrcResponse) +GetDstBySrcResponse.thrift_spec = ( + None, # 0 + (1, TType.STRUCT, 'result', [ResponseCommon, ResponseCommon.thrift_spec, False], None, 0, ), # 1 + (2, TType.STRUCT, 'dsts', [nebula3.common.ttypes.DataSet, nebula3.common.ttypes.DataSet.thrift_spec, False], None, 1, ), # 2 +) + +GetDstBySrcResponse.thrift_struct_annotations = { +} +GetDstBySrcResponse.thrift_field_annotations = { +} + +def GetDstBySrcResponse__init__(self, result=None, dsts=None,): + self.result = result + self.dsts = dsts + +GetDstBySrcResponse.__init__ = GetDstBySrcResponse__init__ + +def GetDstBySrcResponse__setstate__(self, state): + state.setdefault('result', None) + state.setdefault('dsts', None) + self.__dict__ = state + +GetDstBySrcResponse.__getstate__ = lambda self: self.__dict__.copy() +GetDstBySrcResponse.__setstate__ = GetDstBySrcResponse__setstate__ + all_structs.append(ExecResponse) ExecResponse.thrift_spec = ( None, # 0