guluo2016 commented on code in PR #7529: URL: https://github.com/apache/hbase/pull/7529#discussion_r2686662765
########## hbase-examples/src/main/python/thrift1/DemoClient.py: ########## @@ -1,212 +1,245 @@ #!/usr/bin/env python -''' - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. -''' +""" +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +""" import sys import time -import os from thrift.transport import TSocket, TTransport from thrift.protocol import TBinaryProtocol from gen_py.hbase import ttypes from gen_py.hbase.Hbase import Client, ColumnDescriptor, Mutation + def printVersions(row, versions): - print("row: " + row + ", values: ", end=' ') - for cell in versions: - print(cell.value + "; ", end=' ') - print() + print("row: " + row.decode() + ", values: ", end="") + for cell in versions: + print(cell.value.decode() + "; ", end="") + print() -def printRow(entry): - print("row: " + entry.row + ", cols:", end=' ') - for k in sorted(entry.columns): - print(k + " => " + entry.columns[k].value, end=' ') - print() +def printRow(row_result): + for res in row_result: + sorted_cols = dict(sorted(res.columns.items())) + row_str = "" + for k, v in sorted_cols.items(): + # ignore error to prevent UnicodeDecodeError: 'utf-8' codec can't decode byte 0xfc in + # position 4: invalid start byte + row_str += ( + f"{k.decode('utf-8')} => {v.value.decode('utf-8', errors='ignore')}; " + ) + print(f"row: {res.row.decode('utf-8', errors='ignore')}, cols: {row_str}") -def demo_client(host, port, is_framed_transport): - # Make socket - socket = TSocket.TSocket(host, port) - - # Make transport - if is_framed_transport: - transport = TTransport.TFramedTransport(socket) - else: - transport = TTransport.TBufferedTransport(socket) - - # Wrap in a protocol - protocol = TBinaryProtocol.TBinaryProtocol(transport) - - # Create a client to use the protocol encoder - client = Client(protocol) - - # Connect! - transport.open() - - # Check Thrift Server Type - serverType = client.getThriftServerType() - if serverType != ttypes.TThriftServerType.ONE: - raise RuntimeError(f"Mismatch between client and server, server type is {serverType}") - - t = "demo_table" - - # - # Scan all tables, look for the demo table and delete it. - # - print("scanning tables...") - for table in client.getTableNames(): - print(f" found: {table}") - if table == t: - if client.isTableEnabled(table): - print(f" disabling table: {t}") - client.disableTable(table) - print(f" deleting table: {t}") - client.deleteTable(table) - - columns = [] - col = ColumnDescriptor() - col.name = 'entry:' - col.maxVersions = 10 - columns.append(col) - col = ColumnDescriptor() - col.name = 'unused:' - columns.append(col) - - try: - print(f"creating table: {t}") - client.createTable(t, columns) - except ttypes.AlreadyExists as ae: - print("WARN: " + ae.message) - - cols = client.getColumnDescriptors(t) - print(f"column families in {t}") - for col_name in cols.keys(): - col = cols[col_name] - print(f" column: {col.name}, maxVer: {col.maxVersions}") - - dummy_attributes = {} - # - # Test UTF-8 handling - # - invalid = "foo-\xfc\xa1\xa1\xa1\xa1\xa1" - valid = "foo-\xE7\x94\x9F\xE3\x83\x93\xE3\x83\xBC\xE3\x83\xAB"; - - # non-utf8 is fine for data - mutations = [Mutation(column="entry:foo",value=invalid)] - print(str(mutations)) - client.mutateRow(t, "foo", mutations, dummy_attributes) - - # try empty strings - mutations = [Mutation(column="entry:", value="")] - client.mutateRow(t, "", mutations, dummy_attributes) - - # this row name is valid utf8 - mutations = [Mutation(column="entry:foo", value=valid)] - client.mutateRow(t, valid, mutations, dummy_attributes) - - # non-utf8 is not allowed in row names - try: - mutations = [Mutation(column="entry:foo", value=invalid)] - client.mutateRow(t, invalid, mutations, dummy_attributes) - except ttypes.IOError as e: - print(f'expected exception: {e.message}') - - # Run a scanner on the rows we just created - print("Starting scanner...") - scanner = client.scannerOpen(t, "", ["entry:"], dummy_attributes) - - r = client.scannerGet(scanner) - while r: - printRow(r[0]) - r = client.scannerGet(scanner) - print("Scanner finished") - - # - # Run some operations on a bunch of rows. - # - for e in range(100, 0, -1): - # format row keys as "00000" to "00100" - row = f"{row:05}" - - mutations = [Mutation(column="unused:", value="DELETE_ME")] - client.mutateRow(t, row, mutations, dummy_attributes) - printRow(client.getRow(t, row, dummy_attributes)[0]) - client.deleteAllRow(t, row, dummy_attributes) - - mutations = [Mutation(column="entry:num", value="0"), - Mutation(column="entry:foo", value="FOO")] - client.mutateRow(t, row, mutations, dummy_attributes) - printRow(client.getRow(t, row, dummy_attributes)[0]); - - mutations = [Mutation(column="entry:foo",isDelete=True), - Mutation(column="entry:num",value="-1")] - client.mutateRow(t, row, mutations, dummy_attributes) - printRow(client.getRow(t, row, dummy_attributes)[0]) - - mutations = [Mutation(column="entry:num", value=str(e)), - Mutation(column="entry:sqr", value=str(e*e))] - client.mutateRow(t, row, mutations, dummy_attributes) - printRow(client.getRow(t, row, dummy_attributes)[0]) - - time.sleep(0.05) - - mutations = [Mutation(column="entry:num",value="-999"), - Mutation(column="entry:sqr",isDelete=True)] - client.mutateRowTs(t, row, mutations, 1, dummy_attributes) # shouldn't override latest - printRow(client.getRow(t, row, dummy_attributes)[0]) - - versions = client.getVer(t, row, "entry:num", 10, dummy_attributes) - printVersions(row, versions) - if len(versions) != 3: - print("FATAL: wrong # of versions") - sys.exit(-1) - - r = client.get(t, row, "entry:foo", dummy_attributes) - # just to be explicit, we get lists back, if it's empty there was no matching row. - if len(r) > 0: - raise RuntimeError("shouldn't get here!") - - columnNames = [] - for (col, desc) in client.getColumnDescriptors(t).items(): - print("column with name: "+desc.name) - print(desc) - columnNames.append(desc.name+":") - - print("Starting scanner...") - scanner = client.scannerOpenWithStop(t, "00020", "00040", columnNames, dummy_attributes) - - r = client.scannerGet(scanner) - while r: - printRow(r[0]) - r = client.scannerGet(scanner) - - client.scannerClose(scanner) - print("Scanner finished") - - transport.close() - - -if __name__ == '__main__': - if len(sys.argv) < 3: - print(f'usage: {__file__} <host> <port>') - sys.exit(1) - - host = sys.argv[1] - port = sys.argv[2] - is_framed_transport = False - demo_client(host, port, is_framed_transport) +def demo_client(host, port, is_framed_transport): + # Make socket + socket = TSocket.TSocket(host, port) + + # Make transport + if is_framed_transport: + transport = TTransport.TFramedTransport(socket) + else: + transport = TTransport.TBufferedTransport(socket) + + # Wrap in a protocol + protocol = TBinaryProtocol.TBinaryProtocol(transport) + + # Create a client to use the protocol encoder + client = Client(protocol) + + # Connect! + transport.open() + + # Check Thrift Server Type + serverType = client.getThriftServerType() + if serverType != ttypes.TThriftServerType.ONE: + raise RuntimeError( + f"Mismatch between client and server, server type is {serverType}" + ) + + demo_table = "demo_table".encode() + disable_table = "disabled_table".encode() + + # Scan all tables, look for the demo table and delete it. + print("scanning tables...") + for table in client.getTableNames(): + print(f" found: {table.decode()}") + if table in {demo_table, disable_table}: + if client.isTableEnabled(table): + print(f" disabling table: {table.decode()}") + client.disableTable(table) + print(f" deleting table: {table.decode()}") + client.deleteTable(table) + + # Create the demo table with two column families, entry: and unused: + columns = [] + col = ColumnDescriptor() + col.name = "entry:".encode() + col.maxVersions = 10 + columns.append(col) + col = ColumnDescriptor() + col.name = "unused:".encode() + columns.append(col) + + print(f"creating table: {demo_table.decode()}") + try: + client.createTable(demo_table, columns) + client.createTable(disable_table, columns) + except ttypes.AlreadyExists as ae: + print("WARN: " + ae.message) + + cols = client.getColumnDescriptors(demo_table) + print(f"column families in {demo_table.decode()}: ") + for col_name in cols.keys(): + col = cols[col_name] + print(f" column: {col.name.decode()}, maxVer: {col.maxVersions}") + + if client.isTableEnabled(disable_table): + print(f"disabling table: {disable_table.decode()}") + client.disableTable(disable_table) + + dummy_attributes = {} + + # Test UTF-8 handling + invalid = b"foo-\xfc\xa1\xa1\xa1\xa1" + valid = b"foo-\xe7\x94\x9f\xe3\x83\x93\xe3\x83\xbc\xe3\x83\xab" + + # non-utf8 is fine for data + mutations = [Mutation(column="entry:foo".encode(), value=invalid, writeToWAL=False)] + client.mutateRow(demo_table, "foo".encode(), mutations, dummy_attributes) + + # this row name is valid utf8 + mutations = [Mutation(column="entry:foo".encode(), value=valid, writeToWAL=False)] + client.mutateRow(demo_table, valid, mutations, dummy_attributes) + + # non-utf8 is now allowed in row names because HBase stores values as binary + mutations = [Mutation(column="entry:foo".encode(), value=invalid, writeToWAL=False)] + client.mutateRow(demo_table, invalid, mutations, dummy_attributes) + + # Run a scanner on the rows we just created + print("Starting scanner...") + scanner = client.scannerOpen( + demo_table, "".encode(), ["entry".encode()], dummy_attributes + ) + + while True: + r = client.scannerGet(scanner) + if not r: + break + printRow(r) + print("Scanner finished...") + + # Run some operations on a bunch of rows. + for e in range(100, -1, -1): + # format row keys as "00000" to "00100" + row = f"{e:05}".encode() + + mutations = [ + Mutation( + column="unused:".encode(), value="DELETE_ME".encode(), writeToWAL=False + ) + ] + client.mutateRow(demo_table, row, mutations, dummy_attributes) + printRow(client.getRow(demo_table, row, dummy_attributes)) + client.deleteAllRow(demo_table, row, dummy_attributes) + + # sleep to force later timestamp + time.sleep(0.05) + + mutations = [ + Mutation(column="entry:num".encode(), value="0".encode(), writeToWAL=False), + Mutation( + column="entry:foo".encode(), value="FOO".encode(), writeToWAL=False + ), + ] + client.mutateRow(demo_table, row, mutations, dummy_attributes) + printRow(client.getRow(demo_table, row, dummy_attributes)) + + mutations = [ + Mutation(column="entry:foo".encode(), isDelete=True), + Mutation(column="entry:num".encode(), value="-1".encode()), + ] + client.mutateRow(demo_table, row, mutations, dummy_attributes) + printRow(client.getRow(demo_table, row, dummy_attributes)) + + mutations = [ + Mutation( + column="entry:num".encode(), value=str(e).encode(), writeToWAL=False + ), + Mutation( + column="entry:sqr".encode(), value=str(e * e).encode(), writeToWAL=False + ), + ] + client.mutateRow(demo_table, row, mutations, dummy_attributes) + printRow(client.getRow(demo_table, row, dummy_attributes)) + + # sleep to force later timestamp + time.sleep(0.05) + + mutations = [ + Mutation(column="entry:num".encode(), value="-999".encode()), + Mutation(column="entry:sqr".encode(), isDelete=True), + ] + # shouldn't override latest + client.mutateRowTs(demo_table, row, mutations, 1, dummy_attributes) + printRow(client.getRow(demo_table, row, dummy_attributes)) + + versions = client.getVer( + demo_table, row, "entry:num".encode(), 10, dummy_attributes + ) + printVersions(row, versions) + if len(versions) == 0: Review Comment: The old code is `if len(versions) != 3:` in here,which seems to be correct. Is it necessary to change this? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
