02010_lc_native: Generate a new id for each query

This commit is contained in:
Raúl Marín 2021-11-24 17:19:55 +01:00
parent 2da5c6b71b
commit c65d904d37

View File

@ -8,7 +8,6 @@ import uuid
CLICKHOUSE_HOST = os.environ.get('CLICKHOUSE_HOST', '127.0.0.1') CLICKHOUSE_HOST = os.environ.get('CLICKHOUSE_HOST', '127.0.0.1')
CLICKHOUSE_PORT = int(os.environ.get('CLICKHOUSE_PORT_TCP', '900000')) CLICKHOUSE_PORT = int(os.environ.get('CLICKHOUSE_PORT_TCP', '900000'))
CLICKHOUSE_DATABASE = os.environ.get('CLICKHOUSE_DATABASE', 'default') CLICKHOUSE_DATABASE = os.environ.get('CLICKHOUSE_DATABASE', 'default')
CLICKHOUSE_QUERY_ID = uuid.uuid4().hex
def writeVarUInt(x, ba): def writeVarUInt(x, ba):
for _ in range(0, 9): for _ in range(0, 9):
@ -111,9 +110,9 @@ def receiveHello(s):
# print("Version patch: ", server_version_patch) # print("Version patch: ", server_version_patch)
def serializeClientInfo(ba): def serializeClientInfo(ba, query_id):
writeStringBinary('default', ba) # initial_user writeStringBinary('default', ba) # initial_user
writeStringBinary(CLICKHOUSE_QUERY_ID, ba) # initial_query_id writeStringBinary(query_id, ba) # initial_query_id
writeStringBinary('127.0.0.1:9000', ba) # initial_address writeStringBinary('127.0.0.1:9000', ba) # initial_address
ba.extend([0] * 8) # initial_query_start_time_microseconds ba.extend([0] * 8) # initial_query_start_time_microseconds
ba.append(1) # TCP ba.append(1) # TCP
@ -131,13 +130,14 @@ def serializeClientInfo(ba):
def sendQuery(s, query): def sendQuery(s, query):
ba = bytearray() ba = bytearray()
query_id = uuid.uuid4().hex
writeVarUInt(1, ba) # query writeVarUInt(1, ba) # query
writeStringBinary(CLICKHOUSE_QUERY_ID, ba) writeStringBinary(query_id, ba)
ba.append(1) # INITIAL_QUERY ba.append(1) # INITIAL_QUERY
# client info # client info
serializeClientInfo(ba) serializeClientInfo(ba, query_id)
writeStringBinary('', ba) # No settings writeStringBinary('', ba) # No settings
writeStringBinary('', ba) # No interserver secret writeStringBinary('', ba) # No interserver secret