[fix][dingo-executor] Update protobuf version to 3.25.5 and txn mutat…

…ion max count to 4096
dingodb · Sep 29, 2024 · fb8501c · fb8501c
1 parent 5c7abcd
commit fb8501c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/dingo-driver/mysql-service/src/main/java/io/dingodb/driver/mysql/command/MysqlCommands.java b/dingo-driver/mysql-service/src/main/java/io/dingodb/driver/mysql/command/MysqlCommands.java
@@ -90,7 +90,7 @@ public void execute(QueryPacket queryPacket,
  throw new RuntimeException(e);
  }
  AtomicLong packetId = new AtomicLong(queryPacket.packetId + 1);
- LogUtils.debug(log, "receive sql:" + sql);
+ LogUtils.debug(log, "dingo connection:{}, receive sql:{}", mysqlConnection.getConnection().toString(), sql);
  if (mysqlConnection.passwordExpire && !doExpire(mysqlConnection, sql, packetId)) {
  MysqlResponseHandler.responseError(packetId, mysqlConnection.channel, ErrorCode.ER_PASSWORD_EXPIRE);
  return;

diff --git a/dingo-exec/src/main/java/io/dingodb/exec/transaction/util/TransactionUtil.java b/dingo-exec/src/main/java/io/dingodb/exec/transaction/util/TransactionUtil.java
@@ -61,7 +61,7 @@
 @Slf4j
 public final class TransactionUtil {
  public static final long lock_ttl = 60000L;
- public static final int max_pre_write_count = 1024;
+ public static final int max_pre_write_count = 4096;
  public static final long maxRpcDataSize = 56*1024*1024;
  public static final long heartBeatLockTtl = 80L;
  public static final int STORE_RETRY = 60;

diff --git a/dingo-executor/src/main/java/io/dingodb/server/executor/schedule/SafePointUpdateTask.java b/dingo-executor/src/main/java/io/dingodb/server/executor/schedule/SafePointUpdateTask.java
@@ -165,8 +165,7 @@ private static void safePointUpdate() {
 
  LogUtils.info(log, "Update safe point to: {}", safeTs);
  if (!isDisable(reqTs)) {
- UpdateGCSafePointRequest.UpdateGCSafePointRequestBuilder<?, ?> builder = UpdateGCSafePointRequest.builder()
- .gcFlag(GcFlagType.GC_START);
+ UpdateGCSafePointRequest.UpdateGCSafePointRequestBuilder<?, ?> builder = UpdateGCSafePointRequest.builder();
  // TODO
  builder.safePoint(0);
  if (TenantConstant.TENANT_ID == 0) {
@@ -177,6 +176,8 @@ private static void safePointUpdate() {
  Services.coordinatorService(coordinators).updateGCSafePoint(
  reqTs, builder.build()
  );
+ } else {
+ LogUtils.info(log, "Safe point update task disabled, skip call coordinator.");
  }
  } catch (Exception e) {
  LogUtils.error(log, "Update safe point error, skip this run.", e);

diff --git a/gradle.properties b/gradle.properties
@@ -119,7 +119,7 @@ disruptor.version=3.3.7
 hamcrest.version=1.3
 jmh.version=1.20
 asm.version=6.0
-protobuf.version=3.21.7
+protobuf.version=3.25.5
 metrics-core.version=4.0.2
 metrics-jmx.version=4.0.2
 jctools-core.version=2.1.1