From 426f63aa3003cf8ab86981cad29b213b35a2f26b Mon Sep 17 00:00:00 2001 From: He Wang Date: Fri, 8 Jul 2022 17:47:57 +0800 Subject: [PATCH] update logmessage based on internal version (#51) * update logmessage from internal store client * update comments --- .../enums/DbCategoryEnum.java} | 29 +-- .../oms/common/enums/DbTypeEnum.java | 85 +++++++ .../oceanbase/oms/logmessage/DataMessage.java | 90 ++++--- .../oms/logmessage/FieldParseListener.java | 37 ++- .../oceanbase/oms/logmessage/LogMessage.java | 238 +++++++++--------- .../typehelper/LogMessageTypeCode.java | 106 ++++---- .../logmessage/typehelper/LogTypeHelper.java | 8 +- .../typehelper/LogTypeHelperFactory.java | 11 +- .../typehelper/OBLogTypeHelper.java | 48 ++-- .../oms/logmessage/utils/StringUtils.java | 63 ----- .../client/config/ObReaderConfig.java | 4 +- pom.xml | 2 +- 12 files changed, 386 insertions(+), 335 deletions(-) rename common/src/main/java/com/oceanbase/oms/{logmessage/enums/DBType.java => common/enums/DbCategoryEnum.java} (71%) create mode 100644 common/src/main/java/com/oceanbase/oms/common/enums/DbTypeEnum.java delete mode 100644 common/src/main/java/com/oceanbase/oms/logmessage/utils/StringUtils.java diff --git a/common/src/main/java/com/oceanbase/oms/logmessage/enums/DBType.java b/common/src/main/java/com/oceanbase/oms/common/enums/DbCategoryEnum.java similarity index 71% rename from common/src/main/java/com/oceanbase/oms/logmessage/enums/DBType.java rename to common/src/main/java/com/oceanbase/oms/common/enums/DbCategoryEnum.java index be3e539..5685912 100644 --- a/common/src/main/java/com/oceanbase/oms/logmessage/enums/DBType.java +++ b/common/src/main/java/com/oceanbase/oms/common/enums/DbCategoryEnum.java @@ -8,21 +8,16 @@ EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. See the Mulan PSL v2 for more details. */ -package com.oceanbase.oms.logmessage.enums; - -/** Database type enumeration for open source. */ -public enum DBType { - MYSQL, - - OCEANBASE, - - HBASE, - - ORACLE, - - OCEANBASE1, - - DB2, - - UNKNOWN +package com.oceanbase.oms.common.enums; + +public enum DbCategoryEnum { + + /** Relational database. */ + RDB, + /** Message queue. */ + MQ, + /** Big data. */ + BIGDATA, + /** Not only SQL. */ + NOSQL; } diff --git a/common/src/main/java/com/oceanbase/oms/common/enums/DbTypeEnum.java b/common/src/main/java/com/oceanbase/oms/common/enums/DbTypeEnum.java new file mode 100644 index 0000000..cff17fa --- /dev/null +++ b/common/src/main/java/com/oceanbase/oms/common/enums/DbTypeEnum.java @@ -0,0 +1,85 @@ +/* Copyright (c) 2021 OceanBase and/or its affiliates. All rights reserved. +oblogclient is licensed under Mulan PSL v2. +You can use this software according to the terms and conditions of the Mulan PSL v2. +You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 +THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, +EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, +MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. +See the Mulan PSL v2 for more details. */ + +package com.oceanbase.oms.common.enums; + + +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + +public enum DbTypeEnum { + + /** OceanBase 0.5. */ + OB_05(DbCategoryEnum.RDB, new HashSet<>(Arrays.asList("oceanbase", "ob05"))), + + /** OceanBase in MySQL mode. */ + OB_MYSQL( + DbCategoryEnum.RDB, + new HashSet<>(Arrays.asList("oceanbase1", "ob10", "oceanbase_mysql_mode"))), + + /** OceanBase in Oracle mode. */ + OB_ORACLE( + DbCategoryEnum.RDB, + new HashSet<>(Arrays.asList("oceanbase_oracle_mode", "ob_in_oracle_mode"))), + + UNKNOWN(null); + + DbTypeEnum(DbCategoryEnum category) { + this.category = category; + this.aliases = Collections.emptySet(); + } + + DbTypeEnum(DbCategoryEnum category, Set aliases) { + this.category = category; + this.aliases = aliases; + } + + public static DbTypeEnum fromAlias(String alias) { + return ALIAS_ENUM_MAP.get(alias.toLowerCase()); + } + + public static DbTypeEnum valueOfIgnoreCase(String value) { + try { + if (DbTypeEnum.fromAlias(value) != null) { + return DbTypeEnum.fromAlias(value); + } else { + return DbTypeEnum.valueOf(value.toUpperCase()); + } + } catch (IllegalArgumentException e) { + return null; + } + } + + private static final Map ALIAS_ENUM_MAP = new HashMap<>(); + + static { + for (DbTypeEnum one : values()) { + for (String alias : one.getAliases()) { + assert !ALIAS_ENUM_MAP.containsKey(alias.toLowerCase()); + ALIAS_ENUM_MAP.put(alias.toLowerCase(), one); + } + } + } + + private final DbCategoryEnum category; + private final Set aliases; + + public DbCategoryEnum getCategory() { + return category; + } + + public Set getAliases() { + return aliases; + } +} diff --git a/common/src/main/java/com/oceanbase/oms/logmessage/DataMessage.java b/common/src/main/java/com/oceanbase/oms/logmessage/DataMessage.java index b97686c..15813d7 100644 --- a/common/src/main/java/com/oceanbase/oms/logmessage/DataMessage.java +++ b/common/src/main/java/com/oceanbase/oms/logmessage/DataMessage.java @@ -11,9 +11,9 @@ See the Mulan PSL v2 for more details. */ package com.oceanbase.oms.logmessage; -import com.oceanbase.oms.logmessage.enums.DBType; +import com.oceanbase.oms.common.enums.DbTypeEnum; import com.oceanbase.oms.logmessage.typehelper.LogTypeHelper; -import com.oceanbase.oms.logmessage.typehelper.OBLogTypeHelper; +import com.oceanbase.oms.logmessage.typehelper.LogTypeHelperFactory; import java.io.DataInputStream; import java.io.IOException; import java.util.ArrayList; @@ -31,7 +31,6 @@ public class DataMessage extends Message { /** Record contains data of one record. */ public static class Record { - public static LogTypeHelper logTypeHelper = OBLogTypeHelper.OB_LOG_TYPE_HELPER; public static final String UTF8MB4_ENCODING = "utf8mb4"; public static final String TRACEID_STRING = "traceid"; @@ -122,6 +121,8 @@ public class DataMessage extends Message { public boolean prev = false; + public boolean notNull = false; + public enum Type { INT8, INT16, @@ -190,6 +191,10 @@ public class DataMessage extends Message { this.flag = flag; } + public void setNotNull(boolean notNull) { + this.notNull = notNull; + } + public final boolean isPrimary() { return primaryKey; } @@ -223,6 +228,10 @@ public class DataMessage extends Message { return encoding; } + public final boolean getNotNull() { + return notNull; + } + public static Type[] MYSQL_TYPES = new Type[256]; static { @@ -371,6 +380,7 @@ public class DataMessage extends Message { builder.append("Field name: " + name + System.getProperty("line.separator")); builder.append("Field type: " + type + System.getProperty("line.separator")); builder.append("Field length: " + length + System.getProperty("line.separator")); + builder.append("Field notNull: " + notNull + System.getProperty("line.separator")); if (value != null) { if ("binary".equalsIgnoreCase(encoding)) { builder.append( @@ -447,7 +457,9 @@ public class DataMessage extends Message { type = Type.valueOf(stype.toUpperCase()); // set timestamp,process heartbeat between tx timestamp = getAttribute("timestamp"); - if (getDbType() == DBType.OCEANBASE1) { + DbTypeEnum dbType = getDbType(); + LogTypeHelper logTypeHelper = LogTypeHelperFactory.getInstance(dbType); + if (dbType == DbTypeEnum.OB_MYSQL || dbType == DbTypeEnum.OB_ORACLE) { if (type == Type.HEARTBEAT) { globalSafeTimestamp.set(timestamp); } else { @@ -654,25 +666,8 @@ public class DataMessage extends Message { return getAttribute("unique"); } - public DBType getDbType() { - String type = getAttribute("source_type"); - if (StringUtils.isEmpty(type)) { - return DBType.UNKNOWN; - } - if ("mysql".equalsIgnoreCase(type)) { - return DBType.MYSQL; - } else if ("oceanbase".equalsIgnoreCase(type)) { - return DBType.OCEANBASE; - } else if ("oracle".equalsIgnoreCase(type)) { - return DBType.ORACLE; - } else if ("hbase".equalsIgnoreCase(type)) { - return DBType.HBASE; - } else if ("oceanbase_1_0".equalsIgnoreCase(type)) { - return DBType.OCEANBASE1; - } else if ("db2".equalsIgnoreCase(type)) { - return DBType.DB2; - } - return DBType.UNKNOWN; + public DbTypeEnum getDbType() { + return parseDbTypeStr(getAttribute("source_type")); } public boolean isQueryBack() { @@ -772,15 +767,12 @@ public class DataMessage extends Message { } public String getMessageUniqueIdStr() throws Exception { - DBType dbType = getDbType(); + DbTypeEnum dbType = getDbType(); this.checkDBType(dbType); StringBuilder messageId = new StringBuilder(); - if (dbType == DBType.MYSQL) { - messageId.append(getServerId()); - } messageId.append("/").append(this.getCommonPart()).append("/"); - if (dbType == DBType.OCEANBASE1) { + if (dbType == DbTypeEnum.OB_MYSQL || dbType == DbTypeEnum.OB_ORACLE) { messageId.append("/"); } else { String checkpoint = getCheckpoint(); @@ -791,7 +783,7 @@ public class DataMessage extends Message { } messageId.append("/"); - if (dbType == DBType.OCEANBASE1) { + if (dbType == DbTypeEnum.OB_MYSQL || dbType == DbTypeEnum.OB_ORACLE) { messageId.append(getOB10UniqueId()); } @@ -799,14 +791,15 @@ public class DataMessage extends Message { return messageId.toString(); } - private void checkDBType(DBType dbType) { - if (dbType != DBType.MYSQL - && dbType != DBType.OCEANBASE - && dbType != DBType.OCEANBASE1 - && dbType != DBType.ORACLE - && dbType != DBType.DB2) { - throw new IllegalStateException( - "dbType [" + dbType + "] is not valid for messageId"); + private void checkDBType(DbTypeEnum dbType) { + switch (dbType) { + case OB_MYSQL: + case OB_ORACLE: + case OB_05: + break; + default: + throw new IllegalStateException( + "dbType [" + dbType + "] is not valid for messageId"); } } @@ -914,4 +907,27 @@ public class DataMessage extends Message { public void addRecord(Record r) { records.add(r); } + + public static DbTypeEnum parseDbTypeStr(String dbTypeInStr) { + if (StringUtils.isEmpty(dbTypeInStr)) { + return DbTypeEnum.UNKNOWN; + } + if ("oceanbase".equalsIgnoreCase(dbTypeInStr)) { + return DbTypeEnum.OB_05; + } else if ("oceanbase_1_0".equalsIgnoreCase(dbTypeInStr)) { + return DbTypeEnum.OB_MYSQL; + } + return DbTypeEnum.UNKNOWN; + } + + public static DbTypeEnum parseDBTypeCode(int dbTypeCode) { + switch (dbTypeCode) { + case 1: + return DbTypeEnum.OB_05; + case 4: + return DbTypeEnum.OB_MYSQL; + default: + return DbTypeEnum.UNKNOWN; + } + } } diff --git a/common/src/main/java/com/oceanbase/oms/logmessage/FieldParseListener.java b/common/src/main/java/com/oceanbase/oms/logmessage/FieldParseListener.java index e895c40..72f8b39 100644 --- a/common/src/main/java/com/oceanbase/oms/logmessage/FieldParseListener.java +++ b/common/src/main/java/com/oceanbase/oms/logmessage/FieldParseListener.java @@ -10,15 +10,44 @@ See the Mulan PSL v2 for more details. */ package com.oceanbase.oms.logmessage; + +import com.oceanbase.oms.logmessage.typehelper.LogMessageTypeCode; + /** This interface defined a kind of listener for field parsing. */ public interface FieldParseListener { /** * Handle the filed parsing result. * - * @param prev The original field. - * @param next The field after parsing. - * @throws Exception When exception occurs. + * @param fieldName Field name. + * @param type {@link LogMessageTypeCode}. + * @param encoding Encoding of value. + * @param value Field value. + * @param notNull Flag of whether the field is not null (not optional). + * @param isPrev Flag of whether the value is the old one. + */ + void parseNotify( + String fieldName, + int type, + String encoding, + ByteString value, + boolean notNull, + boolean isPrev); + + /** + * Handle the filed parsing result. Only support value, as we already know schema info. + * + * @param type {@link LogMessageTypeCode}. + * @param value Field value. + * @param encoding Encoding of value. + * @param isPrev Flag of whether the value is the old one. + */ + void parseNotify(int type, ByteString value, String encoding, boolean isPrev); + + /** + * Flag of whether schema info (fieldName, type, encoding, notNull) is needed. + * + * @return True for needed, otherwise false. */ - void parseNotify(DataMessage.Record.Field prev, DataMessage.Record.Field next) throws Exception; + boolean needSchemaInfo(); } diff --git a/common/src/main/java/com/oceanbase/oms/logmessage/LogMessage.java b/common/src/main/java/com/oceanbase/oms/logmessage/LogMessage.java index ee0f365..858c024 100644 --- a/common/src/main/java/com/oceanbase/oms/logmessage/LogMessage.java +++ b/common/src/main/java/com/oceanbase/oms/logmessage/LogMessage.java @@ -11,8 +11,10 @@ See the Mulan PSL v2 for more details. */ package com.oceanbase.oms.logmessage; -import com.oceanbase.oms.logmessage.enums.DBType; +import com.oceanbase.oms.common.enums.DbTypeEnum; import com.oceanbase.oms.logmessage.enums.DataType; +import com.oceanbase.oms.logmessage.typehelper.LogTypeHelper; +import com.oceanbase.oms.logmessage.typehelper.LogTypeHelperFactory; import com.oceanbase.oms.logmessage.utils.BinaryMessageUtils; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; @@ -38,10 +40,9 @@ public class LogMessage extends DataMessage.Record { public static final String UTF8_ENCODING = "UTF-8"; private static final String SEP = System.getProperty("line.separator"); - // old version header length + private static final int OLD_VERSION_2_HEADER_LEN = 88; - // new version header length private static final int NEW_VERSION_2_HEADER_LEN = 96; private static final int VERSION_3_HEADER_LEN = 104; @@ -85,7 +86,7 @@ public class LogMessage extends DataMessage.Record { private long newColsOffset = -1; - private long m_pkValOffset = -1; + private long pkValOffset = -1; private long pkKeysOffset = -1; @@ -101,6 +102,8 @@ public class LogMessage extends DataMessage.Record { private long colFlagOffset = -1; + private long colNotNullOffset = -1; + /** buf parse data */ private String dbName; @@ -120,16 +123,10 @@ public class LogMessage extends DataMessage.Record { private List timeMarks = null; - private List colFilter; - private boolean keyChange = false; - /** - * type bitmap,get array type bytes by type index array first byte : 1, array element is - * unsigned byte 2, array element is unsigned short 4, array element is unsigned int 8, array - * element is long - */ - private static final int[] elementArray = {0, 1, 1, 2, 2, 4, 4, 8, 8}; + /** type size map, used to get array type bytes by type index */ + private static final int[] ELEMENT_ARRAY = {0, 1, 1, 2, 2, 4, 4, 8, 8}; private static final int BYTE_SIZE = 1; @@ -152,33 +149,13 @@ public class LogMessage extends DataMessage.Record { return keyChange; } - @Override - public void setColFilter(List colFilter) { - this.colFilter = colFilter; - } - public int getVersion() { return brVersion; } @Override - public DBType getDbType() { - switch (srcType) { - case 0: - return DBType.MYSQL; - case 1: - return DBType.OCEANBASE; - case 2: - return DBType.HBASE; - case 3: - return DBType.ORACLE; - case 4: - return DBType.OCEANBASE1; - case 5: - return DBType.DB2; - default: - return DBType.UNKNOWN; - } + public DbTypeEnum getDbType() { + return DataMessage.parseDBTypeCode(srcType); } @Override @@ -275,13 +252,19 @@ public class LogMessage extends DataMessage.Record { if (colNamesOffset < 0 || colTypesOffset < 0 || oldColsOffset < 0 || newColsOffset < 0) { return; } - // global encoding - String encodingStr = - BinaryMessageUtils.getString(byteBuf.array(), (int) encoding, DEFAULT_ENCODING); - // pk info - List pks = null; - if ((int) pkKeysOffset > 0) { - pks = BinaryMessageUtils.getArray(byteBuf.array(), (int) pkKeysOffset); + + /* + * global encoding + * + * 对于 DDL 的默认编码改动， DDL DrcMessage 不携带编码信息，只能使用默认编码，但是 ASCII 对于中文处理出错 + * 对于 DDL 默认编码改为 UTF-8，不改变除 DDL 之外其他行为 + */ + String encodingStr = null; + if (this.getOpt() == Type.DDL) { + encodingStr = UTF8_ENCODING; + } else { + encodingStr = + BinaryMessageUtils.getString(byteBuf.array(), (int) encoding, DEFAULT_ENCODING); } // get column count ByteBuf wrapByteBuf = @@ -291,7 +274,7 @@ public class LogMessage extends DataMessage.Record { // op type array wrapByteBuf.readerIndex(PREFIX_LENGTH + (int) colTypesOffset); byte t = wrapByteBuf.readByte(); - int elementSize = elementArray[t & DataType.DT_MASK]; + int elementSize = ELEMENT_ARRAY[t & DataType.DT_MASK]; // encoding int colEncodingsCount = 0; int currentEncodingOffset = 0; @@ -318,14 +301,9 @@ public class LogMessage extends DataMessage.Record { if (0 != newColCount) { currentNewColOffset = (int) wrapByteBuf.readUnsignedInt(); } - + LogTypeHelper logTypeHelper = LogTypeHelperFactory.getInstance(getDbType()); // start loop for (int i = 0; i < count; i++) { - // get pk boolean - boolean isPk = false; - if (pks != null && pks.contains(i)) { - isPk = true; - } // get real op type int type = 0; wrapByteBuf.readerIndex( @@ -344,19 +322,26 @@ public class LogMessage extends DataMessage.Record { type = (int) wrapByteBuf.readLong(); break; } - // get col flag - int flag = 0; - if (colFlagOffset > 0) { - wrapByteBuf.readerIndex( - PREFIX_LENGTH - + (int) colFlagOffset - + BYTE_SIZE - + INT_SIZE - + i * elementSize); - flag = wrapByteBuf.readUnsignedByte(); + boolean notNull = false; + if (fieldParseListener.needSchemaInfo()) { + if (colNotNullOffset > 0) { + wrapByteBuf.readerIndex( + PREFIX_LENGTH + + (int) colNotNullOffset + + BYTE_SIZE + + INT_SIZE + + i * elementSize); + notNull = wrapByteBuf.readBoolean(); + } } // get real encoding String realEncoding = encodingStr; + + // now deliver have fix encoding offset bug, encoding has been decoded correctly + // add db2 compatible code for new version db2 reader + // old else will also saved for old version store + // this code will deprecated in future release + // correct oracle code if oralce reader has update delivier version or correct type code if (colEncodingsCount > 0) { wrapByteBuf.readerIndex( (int) @@ -380,43 +365,32 @@ public class LogMessage extends DataMessage.Record { currentEncodingOffset = nextEncodingOffset; } realEncoding = logTypeHelper.correctEncoding(type, realEncoding); - type = logTypeHelper.correctCode(type, realEncoding); - // colName - wrapByteBuf.readerIndex( - (int) - (PREFIX_LENGTH - + colNamesOffset - + BYTE_SIZE - + INT_SIZE - + (i + 1) * INT_SIZE)); - int nextColNameOffset = (int) wrapByteBuf.readUnsignedInt(); - ByteString ColNameByteString = - new ByteString( - wrapByteBuf.array(), - PREFIX_LENGTH - + currentColNameOffset - + BYTE_SIZE - + INT_SIZE - + (count + 1) * INT_SIZE - + (int) colNamesOffset, - nextColNameOffset - currentColNameOffset - 1); - String columnName = ColNameByteString.toString(); - currentColNameOffset = nextColNameOffset; - Field prev = null; - Field next = null; - - boolean match = false; - // col filter check - if (colFilter != null && colFilter.size() > 0) { - for (String col : colFilter) { - if (col.equalsIgnoreCase(columnName) || "*".equalsIgnoreCase(col)) { - match = true; - } - } - } else { - match = true; - } + String columnName = null; + if (fieldParseListener.needSchemaInfo()) { + type = logTypeHelper.correctCode(type, realEncoding); + // colName + wrapByteBuf.readerIndex( + (int) + (PREFIX_LENGTH + + colNamesOffset + + BYTE_SIZE + + INT_SIZE + + (i + 1) * INT_SIZE)); + int nextColNameOffset = (int) wrapByteBuf.readUnsignedInt(); + ByteString colNameByteString = + new ByteString( + wrapByteBuf.array(), + PREFIX_LENGTH + + currentColNameOffset + + BYTE_SIZE + + INT_SIZE + + (count + 1) * INT_SIZE + + (int) colNamesOffset, + nextColNameOffset - currentColNameOffset - 1); + columnName = colNameByteString.toString(); + currentColNameOffset = nextColNameOffset; + } // old col if (oldColCount != 0) { wrapByteBuf.readerIndex( @@ -440,10 +414,12 @@ public class LogMessage extends DataMessage.Record { + (int) oldColsOffset, nextOldColOffset - currentOldColOffset - 1); } - Field field = new Field(columnName, type, realEncoding, value, isPk); - field.setFlag(flag); - field.setPrev(true); - prev = field; + if (fieldParseListener.needSchemaInfo()) { + fieldParseListener.parseNotify( + columnName, type, realEncoding, value, notNull, true); + } else { + fieldParseListener.parseNotify(type, value, realEncoding, true); + } currentOldColOffset = nextOldColOffset; } // new col @@ -469,15 +445,14 @@ public class LogMessage extends DataMessage.Record { + (int) newColsOffset, nextNewColOffset - currentNewColOffset - 1); } - Field field = new Field(columnName, type, realEncoding, value, isPk); - field.setFlag(flag); - field.setPrev(false); - next = field; + if (fieldParseListener.needSchemaInfo()) { + fieldParseListener.parseNotify( + columnName, type, realEncoding, value, notNull, false); + } else { + fieldParseListener.parseNotify(type, value, realEncoding, false); + } currentNewColOffset = nextNewColOffset; } - if (match) { - fieldParseListener.parseNotify(prev, next); - } } } @@ -491,7 +466,7 @@ public class LogMessage extends DataMessage.Record { || newColsOffset < 0) { return fields; } - + LogTypeHelper logTypeHelper = LogTypeHelperFactory.getInstance(getDbType()); /* * global encoding * @@ -509,7 +484,7 @@ public class LogMessage extends DataMessage.Record { // pk info List pks = null; if ((int) pkKeysOffset > 0) { - pks = BinaryMessageUtils.getArray(byteBuf.array(), (int) pkKeysOffset); + pks = (BinaryMessageUtils.getArray(byteBuf.array(), (int) pkKeysOffset)); } // get column count ByteBuf wrapByteBuf = @@ -520,7 +495,7 @@ public class LogMessage extends DataMessage.Record { // op type array wrapByteBuf.readerIndex(PREFIX_LENGTH + (int) colTypesOffset); byte t = wrapByteBuf.readByte(); - int elementSize = elementArray[t & DataType.DT_MASK]; + int elementSize = ELEMENT_ARRAY[t & DataType.DT_MASK]; // encoding int colEncodingsCount = 0; int currentEncodingOffset = 0; @@ -589,6 +564,16 @@ public class LogMessage extends DataMessage.Record { + i * elementSize); flag = wrapByteBuf.readUnsignedByte(); } + boolean notNull = false; + if (colNotNullOffset > 0) { + wrapByteBuf.readerIndex( + PREFIX_LENGTH + + (int) colNotNullOffset + + BYTE_SIZE + + INT_SIZE + + i * elementSize); + notNull = wrapByteBuf.readBoolean(); + } // get real encoding String realEncoding = encodingStr; @@ -632,7 +617,7 @@ public class LogMessage extends DataMessage.Record { + INT_SIZE + (i + 1) * INT_SIZE)); int nextColNameOffset = (int) wrapByteBuf.readUnsignedInt(); - ByteString ColNameByteString = + ByteString colNameByteString = new ByteString( wrapByteBuf.array(), PREFIX_LENGTH @@ -642,7 +627,7 @@ public class LogMessage extends DataMessage.Record { + (count + 1) * INT_SIZE + (int) colNamesOffset, nextColNameOffset - currentColNameOffset - 1); - String columnName = ColNameByteString.toString(); + String columnName = colNameByteString.toString(); currentColNameOffset = nextColNameOffset; // old col if (oldColCount != 0) { @@ -669,6 +654,7 @@ public class LogMessage extends DataMessage.Record { } Field field = new Field(columnName, type, realEncoding, value, isPk); field.setFlag(flag); + field.setNotNull(notNull); fields.add(field); field.setPrev(true); currentOldColOffset = nextOldColOffset; @@ -698,6 +684,7 @@ public class LogMessage extends DataMessage.Record { } Field field = new Field(columnName, type, realEncoding, value, isPk); field.setFlag(flag); + field.setNotNull(notNull); fields.add(field); field.setPrev(false); currentNewColOffset = nextNewColOffset; @@ -800,9 +787,8 @@ public class LogMessage extends DataMessage.Record { colNamesOffset = byteBuf.readInt(); colTypesOffset = byteBuf.readInt(); - // process old version if (!old) { - m_pkValOffset = byteBuf.readInt(); + pkValOffset = byteBuf.readInt(); fileNameOffset = byteBuf.readLong(); fileOffset = byteBuf.readLong(); if (fileNameOffset < -1 || fileOffset < -1) { @@ -816,12 +802,11 @@ public class LogMessage extends DataMessage.Record { oldColsOffset = byteBuf.readInt(); newColsOffset = byteBuf.readInt(); } else { - // process new version fileNameOffset = byteBuf.readInt(); fileOffset = byteBuf.readInt(); oldColsOffset = byteBuf.readInt(); newColsOffset = byteBuf.readInt(); - m_pkValOffset = byteBuf.readInt(); + pkValOffset = byteBuf.readInt(); } pkKeysOffset = byteBuf.readInt(); @@ -836,16 +821,20 @@ public class LogMessage extends DataMessage.Record { tailOffset = byteBuf.readInt(); long version = id >> 56; - if (version == 1 || version == 2) { + if (version >= 1) { metaVersion = byteBuf.readInt(); colFlagOffset = byteBuf.readInt(); } + if (version >= 2) { + colNotNullOffset = byteBuf.readInt(); + } } // timestamp,process heartbeat between tx Type type = Type.valueOf(op); String ts = Long.toString(timestamp); - if (getDbType() == DBType.OCEANBASE1) { + DbTypeEnum dbTypeEnum = getDbType(); + if (dbTypeEnum == DbTypeEnum.OB_MYSQL || dbTypeEnum == DbTypeEnum.OB_ORACLE) { globalSafeTimestamp.set(String.valueOf(fileNameOffset)); } else { if (type == Type.BEGIN) { @@ -860,7 +849,7 @@ public class LogMessage extends DataMessage.Record { txEnd.set(true); } } - safeTimestamp = new String(globalSafeTimestamp.get()); + safeTimestamp = globalSafeTimestamp.get(); if (isCheckCRC) { checkCRC(); } @@ -1006,7 +995,7 @@ public class LogMessage extends DataMessage.Record { // get key str keysValue = new HashSet(); List keys = - BinaryMessageUtils.getByteStringList(byteBuf.array(), (int) m_pkValOffset); + BinaryMessageUtils.getByteStringList(byteBuf.array(), (int) pkValOffset); if (keys == null || keys.size() == 0) { return null; } @@ -1025,9 +1014,8 @@ public class LogMessage extends DataMessage.Record { case UPDATE: case INDEX_UPDATE: switch (getDbType()) { - case ORACLE: - case MYSQL: - case OCEANBASE1: + case OB_MYSQL: + case OB_ORACLE: prev.addAll(getKeys((int) oldColsOffset, keys)); next.addAll(getKeys((int) newColsOffset, keys)); if (!prev.equals(next)) { @@ -1122,9 +1110,9 @@ public class LogMessage extends DataMessage.Record { public List getPrimaryAndUniqueConstraintColumnIndexTuples() { List tuples = new ArrayList(); try { - if ((int) m_pkValOffset > 0) { + if ((int) pkValOffset > 0) { List rawConstraintByteString = - BinaryMessageUtils.getByteStringList(byteBuf.array(), m_pkValOffset); + BinaryMessageUtils.getByteStringList(byteBuf.array(), pkValOffset); if (rawConstraintByteString != null && !rawConstraintByteString.isEmpty()) { /** * The raw format is "(0,1),(2,3)" or "(", the last one is for empty primary or @@ -1180,10 +1168,10 @@ public class LogMessage extends DataMessage.Record { @Override public List getFirstPKValue() { try { - if ((int) m_pkValOffset < 0) { + if ((int) pkValOffset < 0) { return null; } else { - return BinaryMessageUtils.getByteStringList(byteBuf.array(), m_pkValOffset); + return BinaryMessageUtils.getByteStringList(byteBuf.array(), pkValOffset); } } catch (Exception e) { diff --git a/common/src/main/java/com/oceanbase/oms/logmessage/typehelper/LogMessageTypeCode.java b/common/src/main/java/com/oceanbase/oms/logmessage/typehelper/LogMessageTypeCode.java index b679fd6..8a3b9d5 100644 --- a/common/src/main/java/com/oceanbase/oms/logmessage/typehelper/LogMessageTypeCode.java +++ b/common/src/main/java/com/oceanbase/oms/logmessage/typehelper/LogMessageTypeCode.java @@ -13,62 +13,62 @@ package com.oceanbase.oms.logmessage.typehelper; // compatible with mysql type code // same code may reference different schema type public class LogMessageTypeCode { - public static final int DRC_MSG_TYPE_DECIMAL = 0; - public static final int DRC_MSG_TYPE_TINY = 1; - public static final int DRC_MSG_TYPE_SHORT = 2; - public static final int DRC_MSG_TYPE_LONG = 3; - public static final int DRC_MSG_TYPE_FLOAT = 4; - public static final int DRC_MSG_TYPE_DOUBLE = 5; - public static final int DRC_MSG_TYPE_NULL = 6; - public static final int DRC_MSG_TYPE_TIMESTAMP = 7; - public static final int DRC_MSG_TYPE_LONGLONG = 8; - public static final int DRC_MSG_TYPE_INT24 = 9; - public static final int DRC_MSG_TYPE_DATE = 10; - public static final int DRC_MSG_TYPE_TIME = 11; - public static final int DRC_MSG_TYPE_DATETIME = 12; - public static final int DRC_MSG_TYPE_YEAR = 13; - public static final int DRC_MSG_TYPE_NEWDATE = 14; - public static final int DRC_MSG_TYPE_VARCHAR = 15; - public static final int DRC_MSG_TYPE_BIT = 16; + public static final int LOG_MSG_TYPE_DECIMAL = 0; + public static final int LOG_MSG_TYPE_TINY = 1; + public static final int LOG_MSG_TYPE_SHORT = 2; + public static final int LOG_MSG_TYPE_LONG = 3; + public static final int LOG_MSG_TYPE_FLOAT = 4; + public static final int LOG_MSG_TYPE_DOUBLE = 5; + public static final int LOG_MSG_TYPE_NULL = 6; + public static final int LOG_MSG_TYPE_TIMESTAMP = 7; + public static final int LOG_MSG_TYPE_LONGLONG = 8; + public static final int LOG_MSG_TYPE_INT24 = 9; + public static final int LOG_MSG_TYPE_DATE = 10; + public static final int LOG_MSG_TYPE_TIME = 11; + public static final int LOG_MSG_TYPE_DATETIME = 12; + public static final int LOG_MSG_TYPE_YEAR = 13; + public static final int LOG_MSG_TYPE_NEWDATE = 14; + public static final int LOG_MSG_TYPE_VARCHAR = 15; + public static final int LOG_MSG_TYPE_BIT = 16; - public static final int DRC_MSG_TYPE_TIMESTAMP2 = 17; - public static final int DRC_MSG_TYPE_DATETIME2 = 18; - public static final int DRC_MSG_TYPE_TIME2 = 19; + public static final int LOG_MSG_TYPE_TIMESTAMP2 = 17; + public static final int LOG_MSG_TYPE_DATETIME2 = 18; + public static final int LOG_MSG_TYPE_TIME2 = 19; // appeared in ob define, but should not appeared in drc types - public static final int DRC_MSG_COMPLEX = 160; - public static final int DRC_MSG_TYPE_ARRAY = 161; - public static final int DRC_MSG_TYPE_STRUCT = 162; - public static final int DRC_MSG_TYPE_CURSOR = 163; - public static final int DRC_MSG_TYPE_ORA_BLOB = 210; - public static final int DRC_MSG_TYPE_CLOB = 211; + public static final int LOG_MSG_COMPLEX = 160; + public static final int LOG_MSG_TYPE_ARRAY = 161; + public static final int LOG_MSG_TYPE_STRUCT = 162; + public static final int LOG_MSG_TYPE_CURSOR = 163; + public static final int LOG_MSG_TYPE_ORA_BLOB = 210; + public static final int LOG_MSG_TYPE_CLOB = 211; - public static final int DRC_MSG_TYPE_TEXT = 197; - public static final int DRC_MSG_TYPE_VAR_BINARY = 198; - public static final int DRC_MSG_TYPE_BINARY = 199; - public static final int DRC_MSG_TYPE_TIMESTAMP_WITH_TIME_ZONE = 200; - public static final int DRC_MSG_TYPE_TIMESTAMP_WITH_LOCAL_TIME_ZONE = 201; - public static final int DRC_MSG_TYPE_TIMESTAMP_NANO = 202; - public static final int DRC_MSG_TYPE_RAW = 203; - public static final int DRC_MSG_TYPE_INTERVAL_YEAR_TO_MONTH = 204; - public static final int DRC_MSG_TYPE_INTERVAL_DAY_TO_SECOND = 205; - public static final int DRC_MSG_TYPE_NUMBER_FLOAT = 206; - public static final int DRC_MSG_TYPE_NVARCHAR2 = 207; - public static final int DRC_MSG_TYPE_NCHAR = 208; - public static final int DRC_MSG_TYPE_ROW_ID = 209; + public static final int LOG_MSG_TYPE_TEXT = 197; + public static final int LOG_MSG_TYPE_VAR_BINARY = 198; + public static final int LOG_MSG_TYPE_BINARY = 199; + public static final int LOG_MSG_TYPE_TIMESTAMP_WITH_TIME_ZONE = 200; + public static final int LOG_MSG_TYPE_TIMESTAMP_WITH_LOCAL_TIME_ZONE = 201; + public static final int LOG_MSG_TYPE_TIMESTAMP_NANO = 202; + public static final int LOG_MSG_TYPE_RAW = 203; + public static final int LOG_MSG_TYPE_INTERVAL_YEAR_TO_MONTH = 204; + public static final int LOG_MSG_TYPE_INTERVAL_DAY_TO_SECOND = 205; + public static final int LOG_MSG_TYPE_NUMBER_FLOAT = 206; + public static final int LOG_MSG_TYPE_NVARCHAR2 = 207; + public static final int LOG_MSG_TYPE_NCHAR = 208; + public static final int LOG_MSG_TYPE_ROW_ID = 209; - public static final int DRC_MSG_TYPE_JSON = 245; - public static final int DRC_MSG_TYPE_NEWDECIMAL = 246; - public static final int DRC_MSG_TYPE_ENUM = 247; - public static final int DRC_MSG_TYPE_SET = 248; - public static final int DRC_MSG_TYPE_TINY_BLOB = 249; - public static final int DRC_MSG_TYPE_MEDIUM_BLOB = 250; - public static final int DRC_MSG_TYPE_LONG_BLOB = 251; - public static final int DRC_MSG_TYPE_BLOB = 252; - public static final int DRC_MSG_TYPE_VAR_STRING = 253; - public static final int DRC_MSG_TYPE_STRING = 254; - public static final int DRC_MSG_TYPE_GEOMETRY = 255; - public static final int DRC_MSG_TYPE_ORA_BINARY_FLOAT = 256; - public static final int DRC_MSG_TYPE_ORA_BINARY_DOUBLE = 257; - public static final int DRC_MSG_TYPE_UNKNOWN = DRC_MSG_TYPE_ORA_BINARY_DOUBLE + 1; + public static final int LOG_MSG_TYPE_JSON = 245; + public static final int LOG_MSG_TYPE_NEWDECIMAL = 246; + public static final int LOG_MSG_TYPE_ENUM = 247; + public static final int LOG_MSG_TYPE_SET = 248; + public static final int LOG_MSG_TYPE_TINY_BLOB = 249; + public static final int LOG_MSG_TYPE_MEDIUM_BLOB = 250; + public static final int LOG_MSG_TYPE_LONG_BLOB = 251; + public static final int LOG_MSG_TYPE_BLOB = 252; + public static final int LOG_MSG_TYPE_VAR_STRING = 253; + public static final int LOG_MSG_TYPE_STRING = 254; + public static final int LOG_MSG_TYPE_GEOMETRY = 255; + public static final int LOG_MSG_TYPE_ORA_BINARY_FLOAT = 256; + public static final int LOG_MSG_TYPE_ORA_BINARY_DOUBLE = 257; + public static final int LOG_MSG_TYPE_UNKNOWN = LOG_MSG_TYPE_ORA_BINARY_DOUBLE + 1; } diff --git a/common/src/main/java/com/oceanbase/oms/logmessage/typehelper/LogTypeHelper.java b/common/src/main/java/com/oceanbase/oms/logmessage/typehelper/LogTypeHelper.java index 8249ce8..8f5b5b4 100644 --- a/common/src/main/java/com/oceanbase/oms/logmessage/typehelper/LogTypeHelper.java +++ b/common/src/main/java/com/oceanbase/oms/logmessage/typehelper/LogTypeHelper.java @@ -11,8 +11,8 @@ See the Mulan PSL v2 for more details. */ package com.oceanbase.oms.logmessage.typehelper; +import com.oceanbase.oms.common.enums.DbTypeEnum; import com.oceanbase.oms.logmessage.DataMessage; -import com.oceanbase.oms.logmessage.enums.DBType; public abstract class LogTypeHelper { @@ -20,13 +20,13 @@ public abstract class LogTypeHelper { public static final String EMPTY_ENCODING_STR = ""; - protected final DBType dbType; + protected final DbTypeEnum dbType; - public LogTypeHelper(DBType dbType) { + public LogTypeHelper(DbTypeEnum dbType) { this.dbType = dbType; } - public DBType getDbType() { + public DbTypeEnum getDbType() { return dbType; } diff --git a/common/src/main/java/com/oceanbase/oms/logmessage/typehelper/LogTypeHelperFactory.java b/common/src/main/java/com/oceanbase/oms/logmessage/typehelper/LogTypeHelperFactory.java index 9f9ef6a..439b9ed 100644 --- a/common/src/main/java/com/oceanbase/oms/logmessage/typehelper/LogTypeHelperFactory.java +++ b/common/src/main/java/com/oceanbase/oms/logmessage/typehelper/LogTypeHelperFactory.java @@ -11,17 +11,18 @@ See the Mulan PSL v2 for more details. */ package com.oceanbase.oms.logmessage.typehelper; -import com.oceanbase.oms.logmessage.enums.DBType; +import com.oceanbase.oms.common.enums.DbTypeEnum; public abstract class LogTypeHelperFactory { - public static LogTypeHelper getInstance(DBType dbType) { + public static LogTypeHelper getInstance(DbTypeEnum dbType) { switch (dbType) { - case OCEANBASE: - case OCEANBASE1: + case OB_MYSQL: + case OB_ORACLE: + case OB_05: return OBLogTypeHelper.OB_LOG_TYPE_HELPER; default: - throw new RuntimeException("unsupported dbtype"); + throw new IllegalArgumentException("Unsupported dbType " + dbType); } } } diff --git a/common/src/main/java/com/oceanbase/oms/logmessage/typehelper/OBLogTypeHelper.java b/common/src/main/java/com/oceanbase/oms/logmessage/typehelper/OBLogTypeHelper.java index d4ba801..78da61b 100644 --- a/common/src/main/java/com/oceanbase/oms/logmessage/typehelper/OBLogTypeHelper.java +++ b/common/src/main/java/com/oceanbase/oms/logmessage/typehelper/OBLogTypeHelper.java @@ -11,8 +11,8 @@ See the Mulan PSL v2 for more details. */ package com.oceanbase.oms.logmessage.typehelper; +import com.oceanbase.oms.common.enums.DbTypeEnum; import com.oceanbase.oms.logmessage.DataMessage; -import com.oceanbase.oms.logmessage.enums.DBType; import org.apache.commons.lang3.StringUtils; public class OBLogTypeHelper extends LogTypeHelper { @@ -21,14 +21,14 @@ public class OBLogTypeHelper extends LogTypeHelper { private static final String DEFAULT_ENCODING = ""; public OBLogTypeHelper() { - super(DBType.OCEANBASE1); + super(DbTypeEnum.OB_MYSQL); } @Override public String correctEncoding(int typeCode, String realEncoding) { switch (typeCode) { - case LogMessageTypeCode.DRC_MSG_TYPE_VAR_STRING: - case LogMessageTypeCode.DRC_MSG_TYPE_STRING: + case LogMessageTypeCode.LOG_MSG_TYPE_VAR_STRING: + case LogMessageTypeCode.LOG_MSG_TYPE_STRING: return realEncoding; default: if (StringUtils.equals(realEncoding, "binary")) { @@ -42,23 +42,23 @@ public class OBLogTypeHelper extends LogTypeHelper { @Override public int correctCode(int typeCode, String encoding) { switch (typeCode) { - case LogMessageTypeCode.DRC_MSG_TYPE_TINY_BLOB: - case LogMessageTypeCode.DRC_MSG_TYPE_MEDIUM_BLOB: - case LogMessageTypeCode.DRC_MSG_TYPE_LONG_BLOB: - case LogMessageTypeCode.DRC_MSG_TYPE_BLOB: + case LogMessageTypeCode.LOG_MSG_TYPE_TINY_BLOB: + case LogMessageTypeCode.LOG_MSG_TYPE_MEDIUM_BLOB: + case LogMessageTypeCode.LOG_MSG_TYPE_LONG_BLOB: + case LogMessageTypeCode.LOG_MSG_TYPE_BLOB: if (!StringUtils.isEmpty(encoding) && !StringUtils.equals(encoding, "binary")) { - return LogMessageTypeCode.DRC_MSG_TYPE_CLOB; + return LogMessageTypeCode.LOG_MSG_TYPE_CLOB; } break; - case LogMessageTypeCode.DRC_MSG_TYPE_VAR_STRING: + case LogMessageTypeCode.LOG_MSG_TYPE_VAR_STRING: if (StringUtils.isEmpty(encoding) || StringUtils.equals(encoding, "binary")) { - return LogMessageTypeCode.DRC_MSG_TYPE_VAR_BINARY; + return LogMessageTypeCode.LOG_MSG_TYPE_VAR_BINARY; } else { - return LogMessageTypeCode.DRC_MSG_TYPE_VARCHAR; + return LogMessageTypeCode.LOG_MSG_TYPE_VARCHAR; } - case LogMessageTypeCode.DRC_MSG_TYPE_STRING: + case LogMessageTypeCode.LOG_MSG_TYPE_STRING: if (StringUtils.isEmpty(encoding) || StringUtils.equals(encoding, "binary")) { - return LogMessageTypeCode.DRC_MSG_TYPE_BINARY; + return LogMessageTypeCode.LOG_MSG_TYPE_BINARY; } break; } @@ -68,24 +68,24 @@ public class OBLogTypeHelper extends LogTypeHelper { @Override public void correctField(DataMessage.Record.Field f, String realEncoding) { switch (f.type) { - case LogMessageTypeCode.DRC_MSG_TYPE_TINY_BLOB: - case LogMessageTypeCode.DRC_MSG_TYPE_MEDIUM_BLOB: - case LogMessageTypeCode.DRC_MSG_TYPE_LONG_BLOB: - case LogMessageTypeCode.DRC_MSG_TYPE_BLOB: + case LogMessageTypeCode.LOG_MSG_TYPE_TINY_BLOB: + case LogMessageTypeCode.LOG_MSG_TYPE_MEDIUM_BLOB: + case LogMessageTypeCode.LOG_MSG_TYPE_LONG_BLOB: + case LogMessageTypeCode.LOG_MSG_TYPE_BLOB: if (!StringUtils.isEmpty(f.encoding) && !StringUtils.equals(f.encoding, "binary")) { - f.type = LogMessageTypeCode.DRC_MSG_TYPE_CLOB; + f.type = LogMessageTypeCode.LOG_MSG_TYPE_CLOB; } break; - case LogMessageTypeCode.DRC_MSG_TYPE_VAR_STRING: + case LogMessageTypeCode.LOG_MSG_TYPE_VAR_STRING: if (StringUtils.isEmpty(f.encoding) || StringUtils.equals(f.encoding, "binary")) { - f.type = LogMessageTypeCode.DRC_MSG_TYPE_VAR_BINARY; + f.type = LogMessageTypeCode.LOG_MSG_TYPE_VAR_BINARY; } else { - f.type = LogMessageTypeCode.DRC_MSG_TYPE_VARCHAR; + f.type = LogMessageTypeCode.LOG_MSG_TYPE_VARCHAR; } break; - case LogMessageTypeCode.DRC_MSG_TYPE_STRING: + case LogMessageTypeCode.LOG_MSG_TYPE_STRING: if (StringUtils.isEmpty(f.encoding) || StringUtils.equals(f.encoding, "binary")) { - f.type = LogMessageTypeCode.DRC_MSG_TYPE_BINARY; + f.type = LogMessageTypeCode.LOG_MSG_TYPE_BINARY; } break; default: diff --git a/common/src/main/java/com/oceanbase/oms/logmessage/utils/StringUtils.java b/common/src/main/java/com/oceanbase/oms/logmessage/utils/StringUtils.java deleted file mode 100644 index 4db9d5f..0000000 --- a/common/src/main/java/com/oceanbase/oms/logmessage/utils/StringUtils.java +++ /dev/null @@ -1,63 +0,0 @@ -/* Copyright (c) 2021 OceanBase and/or its affiliates. All rights reserved. -oblogclient is licensed under Mulan PSL v2. -You can use this software according to the terms and conditions of the Mulan PSL v2. -You may obtain a copy of Mulan PSL v2 at: - http://license.coscl.org.cn/MulanPSL2 -THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, -EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, -MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. -See the Mulan PSL v2 for more details. */ - -package com.oceanbase.oms.logmessage.utils; - - -import java.util.ArrayList; -import java.util.List; - -/** Utils class for string. */ -public class StringUtils { - /** - * Split a string by one separator character. The performance is better than Java String split. - * - * @param str The string need be split. - * @param separatorChar The single separator character. - * @return The array of split items. - */ - public static String[] split(String str, char separatorChar) { - if (str == null) { - return null; - } - - int length = str.length(); - - if (length == 0) { - return null; - } - - List list = new ArrayList(); - int i = 0; - int start = 0; - boolean match = false; - - while (i < length) { - if (str.charAt(i) == separatorChar) { - if (match) { - list.add(str.substring(start, i)); - match = false; - } - - start = ++i; - continue; - } - - match = true; - i++; - } - - if (match) { - list.add(str.substring(start, i)); - } - - return list.toArray(new String[list.size()]); - } -} diff --git a/logproxy-client/src/main/java/com/oceanbase/clogproxy/client/config/ObReaderConfig.java b/logproxy-client/src/main/java/com/oceanbase/clogproxy/client/config/ObReaderConfig.java index ccbc14e..4b658bf 100644 --- a/logproxy-client/src/main/java/com/oceanbase/clogproxy/client/config/ObReaderConfig.java +++ b/logproxy-client/src/main/java/com/oceanbase/clogproxy/client/config/ObReaderConfig.java @@ -114,7 +114,7 @@ public class ObReaderConfig extends AbstractConnectionConfig { } @Override - public Map generateConfigurationMap(boolean encrypt_password) { + public Map generateConfigurationMap(boolean encryptPassword) { Map result = new HashMap<>(); for (Map.Entry> entry : configs.entrySet()) { String value = entry.getValue().val.toString(); @@ -123,7 +123,7 @@ public class ObReaderConfig extends AbstractConnectionConfig { if (clusterUrl.key.equals(entry.getKey()) && StringUtils.isEmpty(value)) { continue; } - if (encrypt_password + if (encryptPassword && clusterPassword.key.equals(entry.getKey()) && SharedConf.AUTH_PASSWORD_HASH) { value = Hex.str(CryptoUtil.sha1(value)); diff --git a/pom.xml b/pom.xml index 3ca36ee..908397f 100644 --- a/pom.xml +++ b/pom.xml @@ -259,7 +259,7 @@ See the Mulan PSL v2 for more details. spotless-check validate - check + apply -- GitLab