Skip to content

Commit e8260bd

Browse files
hsz1273327hsz1273327
committed
update
1 parent 46d266c commit e8260bd

File tree

3 files changed

+53
-49
lines changed

3 files changed

+53
-49
lines changed

‎CHANGELOG.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
+ 增加了对mutation的支持
44
+ put操作增加了额外参数
55
+ 丰富了文档
6+
+ 统一了TTableName的输入,现在会全部转换为bytes
7+
+ 统一了TColumn的输入,现在全部会转换为bytes
68

79
# 0.0.1
810

‎document/CHANGELOG.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
+ 增加了对mutation的支持
44
+ put操作增加了额外参数
5+
+ 统一了TTableName的输入,现在会全部转换为bytes
6+
+ 统一了TColumn的输入,现在全部会转换为bytes
57

68
# 0.0.1
79

‎pyhbasecli/HBase.py‎

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -527,7 +527,7 @@ def add_delete(self, *,
527527
raise ResubmitException("can not add mutation to a submited session")
528528
_columns = None
529529
if columns:
530-
_columns = [TColumn(family=c.split(":")[0], qualifier=c.split(":")[1]) if len(c.split(":")) == 2 else TColumn(family=c) for c in columns]
530+
_columns = [TColumn(family=c.split(":")[0].encode(), qualifier=c.split(":")[1].encode()) if len(c.split(":")) == 2 else TColumn(family=c.encode()) for c in columns]
531531
_timestamp = None
532532
if timestamp:
533533
_timestamp = int(timestamp.timestamp() * 1000)
@@ -697,13 +697,13 @@ def create_table(self, table: str, families: List[Dict[str, Any]], *,
697697
AttributeError: 表名格式不合法
698698
"""
699699
if ns is not None:
700-
tableName = TTableName(qualifier=table, ns=ns)
700+
tableName = TTableName(qualifier=table.encode(), ns=ns.encode())
701701
else:
702702
tabelinfo = table.split(":")
703703
if len(tabelinfo) == 1:
704-
tableName = TTableName(qualifier=table)
704+
tableName = TTableName(qualifier=table.encode())
705705
elif len(tabelinfo) == 2:
706-
tableName = TTableName(qualifier=tabelinfo[1], ns=tabelinfo[0])
706+
tableName = TTableName(qualifier=tabelinfo[1].encode(), ns=tabelinfo[0].encode())
707707
else:
708708
raise AttributeError(f"parameter table syntax error: {table}")
709709
sk = None
@@ -738,13 +738,13 @@ def table_exists(self, table: str, *, ns: Optional[str] = None) -> bool:
738738
bool: 是否存在
739739
"""
740740
if ns is not None:
741-
tableName = TTableName(qualifier=table, ns=ns)
741+
tableName = TTableName(qualifier=table.encode(), ns=ns.encode())
742742
else:
743743
tabelinfo = table.split(":")
744744
if len(tabelinfo) == 1:
745-
tableName = TTableName(qualifier=table)
745+
tableName = TTableName(qualifier=table.encode())
746746
elif len(tabelinfo) == 2:
747-
tableName = TTableName(qualifier=tabelinfo[1], ns=tabelinfo[0])
747+
tableName = TTableName(qualifier=tabelinfo[1].encode(), ns=tabelinfo[0].encode())
748748
else:
749749
raise AttributeError(f"parameter table syntax error: {table}")
750750
flg = self.client.tableExists(tableName)
@@ -764,13 +764,13 @@ def desc_table(self, table: str, *, ns: Optional[str] = None) -> Dict[str, str]:
764764
Dict[str, str]: 描述表基础信息
765765
"""
766766
if ns is not None:
767-
tableName = TTableName(qualifier=table, ns=ns)
767+
tableName = TTableName(qualifier=table.encode(), ns=ns.encode())
768768
else:
769769
tabelinfo = table.split(":")
770770
if len(tabelinfo) == 1:
771-
tableName = TTableName(qualifier=table)
771+
tableName = TTableName(qualifier=table.encode())
772772
elif len(tabelinfo) == 2:
773-
tableName = TTableName(qualifier=tabelinfo[1], ns=tabelinfo[0])
773+
tableName = TTableName(qualifier=tabelinfo[1].encode(), ns=tabelinfo[0].encode())
774774
else:
775775
raise AttributeError(f"parameter table syntax error: {table}")
776776

@@ -814,13 +814,13 @@ def show_families(self, table: str, *, ns: Optional[str] = None) -> List[Dict[st
814814
List[Dict[str, Any]]: 列簇信息
815815
"""
816816
if ns is not None:
817-
tableName = TTableName(qualifier=table, ns=ns)
817+
tableName = TTableName(qualifier=table.encode(), ns=ns.encode())
818818
else:
819819
tabelinfo = table.split(":")
820820
if len(tabelinfo) == 1:
821-
tableName = TTableName(qualifier=table)
821+
tableName = TTableName(qualifier=table.encode())
822822
elif len(tabelinfo) == 2:
823-
tableName = TTableName(qualifier=tabelinfo[1], ns=tabelinfo[0])
823+
tableName = TTableName(qualifier=tabelinfo[1].encode(), ns=tabelinfo[0].encode())
824824
else:
825825
raise AttributeError(f"parameter table syntax error: {table}")
826826

@@ -896,13 +896,13 @@ def delete_table(self, table: str, *, ns: Optional[str] = None) -> None:
896896
AttributeError: 表名格式不合法
897897
"""
898898
if ns is not None:
899-
tableName = TTableName(qualifier=table, ns=ns)
899+
tableName = TTableName(qualifier=table.encode(), ns=ns.encode())
900900
else:
901901
tabelinfo = table.split(":")
902902
if len(tabelinfo) == 1:
903-
tableName = TTableName(qualifier=table)
903+
tableName = TTableName(qualifier=table.encode())
904904
elif len(tabelinfo) == 2:
905-
tableName = TTableName(qualifier=tabelinfo[1], ns=tabelinfo[0])
905+
tableName = TTableName(qualifier=tabelinfo[1].encode(), ns=tabelinfo[0].encode())
906906
else:
907907
raise AttributeError(f"parameter table syntax error: {table}")
908908
self.client.deleteTable(tableName)
@@ -918,13 +918,13 @@ def truncate_table(self, table: str, *, ns: Optional[str] = None, preserveSplits
918918
AttributeError: 表名格式不合法
919919
"""
920920
if ns is not None:
921-
tableName = TTableName(qualifier=table, ns=ns)
921+
tableName = TTableName(qualifier=table.encode(), ns=ns.encode())
922922
else:
923923
tabelinfo = table.split(":")
924924
if len(tabelinfo) == 1:
925-
tableName = TTableName(qualifier=table)
925+
tableName = TTableName(qualifier=table.encode())
926926
elif len(tabelinfo) == 2:
927-
tableName = TTableName(qualifier=tabelinfo[1], ns=tabelinfo[0])
927+
tableName = TTableName(qualifier=tabelinfo[1].encode(), ns=tabelinfo[0].encode())
928928
else:
929929
raise AttributeError(f"parameter table syntax error: {table}")
930930
self.client.truncateTable(tableName, preserveSplits)
@@ -939,13 +939,13 @@ def enable_table(self, table: str, *, ns: Optional[str] = None) -> None:
939939
AttributeError: 表名格式不合法
940940
"""
941941
if ns is not None:
942-
tableName = TTableName(qualifier=table, ns=ns)
942+
tableName = TTableName(qualifier=table.encode(), ns=ns.encode())
943943
else:
944944
tabelinfo = table.split(":")
945945
if len(tabelinfo) == 1:
946-
tableName = TTableName(qualifier=table)
946+
tableName = TTableName(qualifier=table.encode())
947947
elif len(tabelinfo) == 2:
948-
tableName = TTableName(qualifier=tabelinfo[1], ns=tabelinfo[0])
948+
tableName = TTableName(qualifier=tabelinfo[1].encode(), ns=tabelinfo[0].encode())
949949
else:
950950
raise AttributeError(f"parameter table syntax error: {table}")
951951
self.client.enableTable(tableName)
@@ -960,13 +960,13 @@ def disable_table(self, table: str, *, ns: Optional[str] = None) -> None:
960960
AttributeError: 表名格式不合法
961961
"""
962962
if ns is not None:
963-
tableName = TTableName(qualifier=table, ns=ns)
963+
tableName = TTableName(qualifier=table.encode(), ns=ns.encode())
964964
else:
965965
tabelinfo = table.split(":")
966966
if len(tabelinfo) == 1:
967-
tableName = TTableName(qualifier=table)
967+
tableName = TTableName(qualifier=table.encode())
968968
elif len(tabelinfo) == 2:
969-
tableName = TTableName(qualifier=tabelinfo[1], ns=tabelinfo[0])
969+
tableName = TTableName(qualifier=tabelinfo[1].encode(), ns=tabelinfo[0].encode())
970970
else:
971971
raise AttributeError(f"parameter table syntax error: {table}")
972972
self.client.disableTable(tableName)
@@ -984,13 +984,13 @@ def is_table_enabled(self, table: str, *, ns: Optional[str] = None) -> bool:
984984
bool: 是否已激活
985985
"""
986986
if ns is not None:
987-
tableName = TTableName(qualifier=table, ns=ns)
987+
tableName = TTableName(qualifier=table.encode(), ns=ns.encode())
988988
else:
989989
tabelinfo = table.split(":")
990990
if len(tabelinfo) == 1:
991-
tableName = TTableName(qualifier=table)
991+
tableName = TTableName(qualifier=table.encode())
992992
elif len(tabelinfo) == 2:
993-
tableName = TTableName(qualifier=tabelinfo[1], ns=tabelinfo[0])
993+
tableName = TTableName(qualifier=tabelinfo[1].encode(), ns=tabelinfo[0].encode())
994994
else:
995995
raise AttributeError(f"parameter table syntax error: {table}")
996996
return self.client.isTableEnabled(tableName)
@@ -1008,13 +1008,13 @@ def is_table_disabled(self, table: str, *, ns: Optional[str] = None) -> bool:
10081008
bool: 是否已取消激活
10091009
"""
10101010
if ns is not None:
1011-
tableName = TTableName(qualifier=table, ns=ns)
1011+
tableName = TTableName(qualifier=table.encode(), ns=ns.encode())
10121012
else:
10131013
tabelinfo = table.split(":")
10141014
if len(tabelinfo) == 1:
1015-
tableName = TTableName(qualifier=table)
1015+
tableName = TTableName(qualifier=table.encode())
10161016
elif len(tabelinfo) == 2:
1017-
tableName = TTableName(qualifier=tabelinfo[1], ns=tabelinfo[0])
1017+
tableName = TTableName(qualifier=tabelinfo[1].encode(), ns=tabelinfo[0].encode())
10181018
else:
10191019
raise AttributeError(f"parameter table syntax error: {table}")
10201020
return self.client.isTableDisabled(tableName)
@@ -1032,13 +1032,13 @@ def is_table_available(self, table: str, *, ns: Optional[str] = None) -> bool:
10321032
bool: 是否可用
10331033
"""
10341034
if ns is not None:
1035-
tableName = TTableName(qualifier=table, ns=ns)
1035+
tableName = TTableName(qualifier=table.encode(), ns=ns.encode())
10361036
else:
10371037
tabelinfo = table.split(":")
10381038
if len(tabelinfo) == 1:
1039-
tableName = TTableName(qualifier=table)
1039+
tableName = TTableName(qualifier=table.encode())
10401040
elif len(tabelinfo) == 2:
1041-
tableName = TTableName(qualifier=tabelinfo[1], ns=tabelinfo[0])
1041+
tableName = TTableName(qualifier=tabelinfo[1].encode(), ns=tabelinfo[0].encode())
10421042
else:
10431043
raise AttributeError(f"parameter table syntax error: {table}")
10441044
return self.client.isTableAvailable(tableName)
@@ -1095,13 +1095,13 @@ def create_family(self, family: str, table: str, *,
10951095
AttributeError: 表名格式不合法
10961096
"""
10971097
if ns is not None:
1098-
tableName = TTableName(qualifier=table, ns=ns)
1098+
tableName = TTableName(qualifier=table.encode(), ns=ns.encode())
10991099
else:
11001100
tabelinfo = table.split(":")
11011101
if len(tabelinfo) == 1:
1102-
tableName = TTableName(qualifier=table)
1102+
tableName = TTableName(qualifier=table.encode())
11031103
elif len(tabelinfo) == 2:
1104-
tableName = TTableName(qualifier=tabelinfo[1], ns=tabelinfo[0])
1104+
tableName = TTableName(qualifier=tabelinfo[1].encode(), ns=tabelinfo[0].encode())
11051105
else:
11061106
raise AttributeError(f"parameter table syntax error: {table}")
11071107
_bloomnFilterType = None
@@ -1155,13 +1155,13 @@ def delete_family(self, family: str, table: str, *, ns: Optional[str] = None) ->
11551155
AttributeError: _description_
11561156
"""
11571157
if ns is not None:
1158-
tableName = TTableName(qualifier=table, ns=ns)
1158+
tableName = TTableName(qualifier=table.encode(), ns=ns.encode())
11591159
else:
11601160
tabelinfo = table.split(":")
11611161
if len(tabelinfo) == 1:
1162-
tableName = TTableName(qualifier=table)
1162+
tableName = TTableName(qualifier=table.encode())
11631163
elif len(tabelinfo) == 2:
1164-
tableName = TTableName(qualifier=tabelinfo[1], ns=tabelinfo[0])
1164+
tableName = TTableName(qualifier=tabelinfo[1].encode(), ns=tabelinfo[0].encode())
11651165
else:
11661166
raise AttributeError(f"parameter table syntax error: {table}")
11671167
self.client.deleteColumnFamily(tableName, family.encode("utf-8"))
@@ -1219,13 +1219,13 @@ def modify_family(self, family: str, table: str, *,
12191219
AttributeError: 表名格式不合法
12201220
"""
12211221
if ns is not None:
1222-
tableName = TTableName(qualifier=table, ns=ns)
1222+
tableName = TTableName(qualifier=table.encode(), ns=ns.encode())
12231223
else:
12241224
tabelinfo = table.split(":")
12251225
if len(tabelinfo) == 1:
1226-
tableName = TTableName(qualifier=table)
1226+
tableName = TTableName(qualifier=table.encode())
12271227
elif len(tabelinfo) == 2:
1228-
tableName = TTableName(qualifier=tabelinfo[1], ns=tabelinfo[0])
1228+
tableName = TTableName(qualifier=tabelinfo[1].encode(), ns=tabelinfo[0].encode())
12291229
else:
12301230
raise AttributeError(f"parameter table syntax error: {table}")
12311231
_bloomnFilterType = None
@@ -1390,7 +1390,7 @@ def delete(self, table: str, row: str, *,
13901390
row_bytes = row.encode("utf8")
13911391
_columns = None
13921392
if columns:
1393-
_columns = [TColumn(family=c.split(":")[0], qualifier=c.split(":")[1]) if len(c.split(":")) == 2 else TColumn(family=c) for c in columns]
1393+
_columns = [TColumn(family=c.split(":")[0].encode(), qualifier=c.split(":")[1].encode()) if len(c.split(":")) == 2 else TColumn(family=c.encode()) for c in columns]
13941394

13951395
_timestamp = None
13961396
if timestamp:
@@ -1523,7 +1523,7 @@ def batch_delete(self, table: str, rows: List[str], *,
15231523
raise AttributeError(f"parameter table syntax error: {table}")
15241524
_columns = None
15251525
if columns:
1526-
_columns = [TColumn(family=c.split(":")[0], qualifier=c.split(":")[1]) if len(c.split(":")) == 2 else TColumn(family=c) for c in columns]
1526+
_columns = [TColumn(family=c.split(":")[0].encode(), qualifier=c.split(":")[1].encode()) if len(c.split(":")) == 2 else TColumn(family=c.encode()) for c in columns]
15271527

15281528
_timestamp = None
15291529
if timestamp:
@@ -1794,7 +1794,7 @@ def exists(self, table: str, row: str, *,
17941794
row_bytes = row.encode("utf8")
17951795
_columns = None
17961796
if columns:
1797-
_columns = [TColumn(family=c.split(":")[0], qualifier=c.split(":")[1]) if len(c.split(":")) == 2 else TColumn(family=c) for c in columns]
1797+
_columns = [TColumn(family=c.split(":")[0].encode(), qualifier=c.split(":")[1].encode()) if len(c.split(":")) == 2 else TColumn(family=c.encode()) for c in columns]
17981798

17991799
_timestamp = None
18001800
if timestamp:
@@ -1901,7 +1901,7 @@ def get(self, table: str, row: str, *,
19011901
row_bytes = row.encode("utf8")
19021902
_columns = None
19031903
if columns:
1904-
_columns = [TColumn(family=c.split(":")[0], qualifier=c.split(":")[1]) if len(c.split(":")) == 2 else TColumn(family=c) for c in columns]
1904+
_columns = [TColumn(family=c.split(":")[0].encode(), qualifier=c.split(":")[1].encode()) if len(c.split(":")) == 2 else TColumn(family=c.encode()) for c in columns]
19051905

19061906
_timestamp = None
19071907
if timestamp:
@@ -2024,7 +2024,7 @@ def batch_get(self, table: str, rows: List[str], *,
20242024
rows_bytes = [row.encode("utf8") for row in rows]
20252025
_columns = None
20262026
if columns:
2027-
_columns = [TColumn(family=c.split(":")[0], qualifier=c.split(":")[1]) if len(c.split(":")) == 2 else TColumn(family=c) for c in columns]
2027+
_columns = [TColumn(family=c.split(":")[0].encode(), qualifier=c.split(":")[1].encode()) if len(c.split(":")) == 2 else TColumn(family=c.encode()) for c in columns]
20282028

20292029
_timestamp = None
20302030
if timestamp:
@@ -2155,7 +2155,7 @@ def scan(self, table: str, *,
21552155
raise AttributeError(f"parameter table syntax error: {table}")
21562156
scan_dict: Dict[str, Any] = {}
21572157
if columns:
2158-
scan_dict["columns"] = [TColumn(family=c.split(":")[0], qualifier=c.split(":")[1]) if len(c.split(":")) == 2 else TColumn(family=c) for c in columns]
2158+
scan_dict["columns"] = [TColumn(family=c.split(":")[0].encode(), qualifier=c.split(":")[1].encode()) if len(c.split(":")) == 2 else TColumn(family=c.encode()) for c in columns]
21592159
if caching:
21602160
scan_dict["caching"] = caching
21612161
if maxVersions:

0 commit comments

Comments
 (0)