8x48/KnowStreaming
1
0
Fork 0
mirror of https://github.com/didi/KnowStreaming.git synced 2025-12-24 03:42:07 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Feature]HA-滴滴Kafka版本信息兼容(#899)

Browse Source
This commit is contained in:
zengqiao
2023-02-09 15:10:06 +08:00
committed by EricZeng
parent caccf9cef5
commit efdf624c67
2 changed files with 90 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
km-common/src/main/java/com/xiaojukeji/know/streaming/km/common/enums/version/VersionEnum.java
View File

@@ -53,7 +53,11 @@ public enum VersionEnum {
V_2_3_1("2.3.1", normailze("2.3.1")),
V_2_4_0("2.4.0", normailze("2.4.0")),
V_2_4_1("2.4.1", normailze("2.4.1")),
V_2_5_0("2.5.0", normailze("2.5.0")),
V_2_5_0_D_300("2.5.0-d-300", normailze("2.5.0-d-300")),
V_2_5_0_D_MAX("2.5.0-d-999", normailze("2.5.0-d-999")),
V_2_5_1("2.5.1", normailze("2.5.1")),
V_2_6_0("2.6.0", normailze("2.6.0")),
V_2_6_1("2.6.1", normailze("2.6.1")),
@@ -77,9 +81,9 @@ public enum VersionEnum {
;
private String version;
private final String version;
private Long versionL;
private final Long versionL;
VersionEnum(String version, Long versionL) {
this.version = version;

120
km-common/src/main/java/com/xiaojukeji/know/streaming/km/common/utils/VersionUtil.java
View File

@@ -3,29 +3,25 @@ package com.xiaojukeji.know.streaming.km.common.utils;
import com.xiaojukeji.know.streaming.km.common.enums.version.VersionEnum;
import org.apache.commons.lang.StringUtils;
public class VersionUtil {
/**
* apache的kafka相关的版本信息
*/
private static final long BASE_VAL = 10000L;
private static final long APACHE_STEP_VAL = 100L;
public static final long APACHE_MAX_VAL = 100000000L;
private static final int MIN_VERSION_SECTIONS_3 = 3;
private static final int MIN_VERSION_SECTIONS_4 = 4;
private static final String VERSION_FORMAT_3 = "%d.%d.%d";
private static final String VERSION_FORMAT_4 = "%d.%d.%d.%d";
public static boolean isValid(String version){
if(StringUtils.isBlank(version)){return false;}
String[] vers = version.split("\\.");
if(null == vers){return false;}
if(vers.length < MIN_VERSION_SECTIONS_3){return false;}
for(String ver : vers){
if(!ver.chars().allMatch(Character::isDigit)){
return false;
}
}
return true;
}
/**
* XiaoJu的kafka相关的版本信息
*/
private static final String XIAO_JU_VERSION_FEATURE = "-d-";
private static final String XIAO_JU_VERSION_FORMAT_4 = "%d.%d.%d-d-%d";
/**
@@ -34,20 +30,64 @@ public class VersionUtil {
* @param version
* @return
*/
public static long normailze(String version){
if (!isValid(version)) {
public static long normailze(String version) {
if(StringUtils.isBlank(version)) {
return -1;
}
String[] vers = version.split("\\.");
if(MIN_VERSION_SECTIONS_3 == vers.length){
return Long.parseLong(vers[0]) * 1000000 + Long.parseLong(vers[1]) * 10000 + Long.parseLong(vers[2]) * 100;
}else if(MIN_VERSION_SECTIONS_4 == vers.length){
return Long.parseLong(vers[0]) * 1000000 + Long.parseLong(vers[1]) * 10000 + Long.parseLong(vers[2]) * 100 + Long.parseLong(vers[3]);
if (version.contains(XIAO_JU_VERSION_FEATURE)) {
// XiaoJu的kafka
return normalizeXiaoJuVersion(version);
}
return -1;
// 检查是否合法
String[] vers = version.split("\\.");
if(vers.length < MIN_VERSION_SECTIONS_3) {
return -1;
}
for(String ver : vers){
if(!ver.chars().allMatch(Character::isDigit)){
return -1;
}
}
// 转为数字
long val = -1;
if(MIN_VERSION_SECTIONS_3 == vers.length) {
val = Long.parseLong(vers[0]) * APACHE_STEP_VAL * APACHE_STEP_VAL * APACHE_STEP_VAL + Long.parseLong(vers[1]) * APACHE_STEP_VAL * APACHE_STEP_VAL + Long.parseLong(vers[2]) * APACHE_STEP_VAL;
} else if(MIN_VERSION_SECTIONS_4 == vers.length) {
val = Long.parseLong(vers[0]) * APACHE_STEP_VAL * APACHE_STEP_VAL * APACHE_STEP_VAL + Long.parseLong(vers[1]) * APACHE_STEP_VAL * APACHE_STEP_VAL + Long.parseLong(vers[2]) * APACHE_STEP_VAL + Long.parseLong(vers[3]);
}
return val == -1? val: val * BASE_VAL;
}
public static long normalizeXiaoJuVersion(String version) {
if(StringUtils.isBlank(version)) {
return -1;
}
if (!version.contains(XIAO_JU_VERSION_FEATURE)) {
// 非XiaoJu的kafka
return normailze(version);
}
String[] vers = version.split(XIAO_JU_VERSION_FEATURE);
if (vers.length < 2) {
return -1;
}
long apacheVal = normailze(vers[0]);
if (apacheVal == -1) {
return apacheVal;
}
Long xiaoJuVal = ConvertUtil.string2Long(vers[1]);
if (xiaoJuVal == null) {
return apacheVal;
}
return apacheVal + xiaoJuVal;
}
/**
@@ -55,15 +95,17 @@ public class VersionUtil {
* @param version
* @return
*/
public static String dNormailze(long version){
long version4 = version % 100;
long version3 = (version / 100) % 100;
long version2 = (version / 10000) % 100;
long version1 = (version / 1000000) % 100;
public static String dNormailze(long version) {
long version4 = (version / BASE_VAL) % APACHE_STEP_VAL;
long version3 = (version / BASE_VAL / APACHE_STEP_VAL) % APACHE_STEP_VAL;
long version2 = (version / BASE_VAL / APACHE_STEP_VAL / APACHE_STEP_VAL) % APACHE_STEP_VAL;
long version1 = (version / BASE_VAL / APACHE_STEP_VAL / APACHE_STEP_VAL / APACHE_STEP_VAL) % APACHE_STEP_VAL;
if(0 == version4){
if (version % BASE_VAL != 0) {
return String.format(XIAO_JU_VERSION_FORMAT_4, version1, version2, version3, version % BASE_VAL);
} else if (0 == version4) {
return String.format(VERSION_FORMAT_3, version1, version2, version3);
}else {
} else {
return String.format(VERSION_FORMAT_4, version1, version2, version3, version4);
}
}
@@ -71,18 +113,24 @@ public class VersionUtil {
public static void main(String[] args){
long n1 = VersionUtil.normailze(VersionEnum.V_0_10_0_0.getVersion());
String v1 = VersionUtil.dNormailze(n1);
System.out.println(VersionEnum.V_0_10_0_0.getVersion() + ":" + n1 + ":" + v1);
System.out.println(VersionEnum.V_0_10_0_0.getVersion() + "\t:\t" + n1 + "\t:\t" + v1);
long n2 = VersionUtil.normailze(VersionEnum.V_0_10_0_1.getVersion());
String v2 = VersionUtil.dNormailze(n2);
System.out.println(VersionEnum.V_0_10_0_1.getVersion() + ":" + n2 + ":" + v2);
System.out.println(VersionEnum.V_0_10_0_1.getVersion() + "\t:\t" + n2 + "\t:\t" + v2);
long n3 = VersionUtil.normailze(VersionEnum.V_0_11_0_3.getVersion());
String v3 = VersionUtil.dNormailze(n3);
System.out.println(VersionEnum.V_0_11_0_3.getVersion() + ":" + n3 + ":" + v3);
System.out.println(VersionEnum.V_0_11_0_3.getVersion() + "\t:\t" + n3 + "\t:\t" + v3);
long n4 = VersionUtil.normailze(VersionEnum.V_2_5_0.getVersion());
String v4 = VersionUtil.dNormailze(n4);
System.out.println(VersionEnum.V_2_5_0.getVersion() + ":" + n4 + ":" + v4);
System.out.println(VersionEnum.V_2_5_0.getVersion() + "\t:\t" + n4 + "\t:\t" + v4);
long n5 = VersionUtil.normailze(VersionEnum.V_2_5_0_D_300.getVersion());
String v5 = VersionUtil.dNormailze(n5);
System.out.println(VersionEnum.V_2_5_0_D_300.getVersion() + "\t:\t" + n4 + "\t:\t" + v5);
System.out.println(Long.MAX_VALUE);
}
}