Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Replace the protocol with header protocol #254

Merged
merged 4 commits into from
Jan 31, 2023
Merged

Replace the protocol with header protocol #254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3b345de
Replace the protocol with header protocol
Aiee Jan 4, 2023
b2ded23
Revert changes
Aiee Jan 4, 2023
97acc41
Update storage client as well
Aiee Jan 18, 2023
ca852c3
Merge branch 'master' into update-transport
Aiee Jan 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions nebula3/gclient/net/Connection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@

import time

from nebula3.fbthrift.transport import TSocket, TTransport, TSSLSocket
from nebula3.fbthrift.transport import TSocket, TSSLSocket, THeaderTransport
from nebula3.fbthrift.transport.TTransport import TTransportException
from nebula3.fbthrift.protocol import TBinaryProtocol
from nebula3.fbthrift.protocol import THeaderProtocol

from nebula3.common.ttypes import ErrorCode
from nebula3.graph import GraphService
Expand Down Expand Up @@ -77,8 +77,9 @@ def open_SSL(self, ip, port, timeout, ssl_config=None):
s = TSocket.TSocket(self._ip, self._port)
if timeout > 0:
s.setTimeout(timeout)
transport = TTransport.TBufferedTransport(s)
protocol = TBinaryProtocol.TBinaryProtocol(transport)
transport = THeaderTransport.THeaderTransport(s)
protocol = THeaderProtocol.THeaderProtocol(transport)

transport.open()
self._connection = GraphService.Client(protocol)
resp = self._connection.verifyClientVersion(VerifyClientVersionReq())
Expand Down
9 changes: 4 additions & 5 deletions nebula3/sclient/net/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,8 @@

from nebula3.Exception import InValidHostname
from nebula3.storage import GraphStorageService
from nebula3.storage.ttypes import ScanVertexRequest, ScanEdgeRequest
from nebula3.fbthrift.transport import TSocket, TTransport
from nebula3.fbthrift.protocol import TBinaryProtocol
from nebula3.fbthrift.transport import TSocket, THeaderTransport
from nebula3.fbthrift.protocol import THeaderProtocol


class GraphStorageConnection(object):
Expand All @@ -35,8 +34,8 @@ def open(self):
s = TSocket.TSocket(self._address.host, self._address.port)
if self._timeout > 0:
s.setTimeout(self._timeout)
transport = TTransport.TBufferedTransport(s)
protocol = TBinaryProtocol.TBinaryProtocol(transport)
transport = THeaderTransport.THeaderTransport(s)
protocol = THeaderProtocol.THeaderProtocol(transport)
transport.open()
self._connection = GraphStorageService.Client(protocol)
except Exception:
Expand Down