From ebffbe6b16eff8b03bf2498ec7f5e268ba9f7deb Mon Sep 17 00:00:00 2001 From: kunlongli Date: Thu, 28 Nov 2024 14:57:50 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0ddc=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=93=8D=E4=BD=9C=E6=8E=A5=E5=8F=A3=20#2776?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/tencent/bkrepo/ddc/pojo/BatchOps.kt | 29 ++++++---- .../bkrepo/ddc/pojo/BatchOpsResponse.kt | 6 +- .../tencent/bkrepo/ddc/utils/CbWriterUtils.kt | 9 +++ .../tencent/bkrepo/ddc/pojo/BatchOpsTest.kt | 55 +++++++++++++++++++ 4 files changed, 84 insertions(+), 15 deletions(-) create mode 100644 src/backend/ddc/biz-ddc/src/test/kotlin/com/tencent/bkrepo/ddc/pojo/BatchOpsTest.kt diff --git a/src/backend/ddc/biz-ddc/src/main/kotlin/com/tencent/bkrepo/ddc/pojo/BatchOps.kt b/src/backend/ddc/biz-ddc/src/main/kotlin/com/tencent/bkrepo/ddc/pojo/BatchOps.kt index 29391a32b3..600ac15998 100644 --- a/src/backend/ddc/biz-ddc/src/main/kotlin/com/tencent/bkrepo/ddc/pojo/BatchOps.kt +++ b/src/backend/ddc/biz-ddc/src/main/kotlin/com/tencent/bkrepo/ddc/pojo/BatchOps.kt @@ -27,6 +27,9 @@ package com.tencent.bkrepo.ddc.pojo +import com.tencent.bkrepo.common.api.exception.ErrorCodeException +import com.tencent.bkrepo.common.api.message.CommonMessageCode +import com.tencent.bkrepo.ddc.serialization.CbArray import com.tencent.bkrepo.ddc.serialization.CbField import com.tencent.bkrepo.ddc.serialization.CbObject import com.tencent.bkrepo.ddc.utils.isBool @@ -43,9 +46,11 @@ data class BatchOps( ) { companion object { fun deserialize(byteArray: ByteArray): BatchOps { - val ops = CbObject(ByteBuffer.wrap(byteArray))[BatchOps::ops.name].asArray().map { - deserializeBatchOp(BatchOp(), it.asObject()) + val opsCbArray = CbObject(ByteBuffer.wrap(byteArray))[BatchOps::ops.name].asArray() + if (opsCbArray == CbArray.EMPTY) { + throw ErrorCodeException(CommonMessageCode.PARAMETER_INVALID, "ops is empty") } + val ops = opsCbArray.map { deserializeBatchOp(BatchOp(), it.asObject()) } return BatchOps(ops) } @@ -60,8 +65,10 @@ data class BatchOps( field.isObject() -> field.asObject() else -> throw RuntimeException("unsupported field type ${field.getType()}") } - cbObject.forEach { field -> - obj.javaClass.getDeclaredField(field.name).set(obj, valOf(field)) + cbObject.forEach { cbField -> + val field = obj.javaClass.getDeclaredField(cbField.name) + field.isAccessible = true + field.set(obj, valOf(cbField)) } return obj } @@ -72,22 +79,22 @@ data class BatchOps( * 操作 */ data class BatchOp( - var opId: Int = 0, - var bucket: String = "", - var key: String = "", - var op: String = Operation.INVALID.toString(), + val opId: Int = 0, + val bucket: String = "", + val key: String = "", + val op: String = Operation.INVALID.toString(), /** * 是否检查ref引用的所有blob是否存在 */ - var resolveAttachments: Boolean = false, + val resolveAttachments: Boolean = false, /** * ref inline blob，op为PUT时有值 */ - var payload: CbObject? = null, + val payload: CbObject? = null, /** * ref inline blob hash, op为PUT时有值 */ - var payloadHash: String? = null, + val payloadHash: String? = null, ) /** diff --git a/src/backend/ddc/biz-ddc/src/main/kotlin/com/tencent/bkrepo/ddc/pojo/BatchOpsResponse.kt b/src/backend/ddc/biz-ddc/src/main/kotlin/com/tencent/bkrepo/ddc/pojo/BatchOpsResponse.kt index b301ced045..c022598c35 100644 --- a/src/backend/ddc/biz-ddc/src/main/kotlin/com/tencent/bkrepo/ddc/pojo/BatchOpsResponse.kt +++ b/src/backend/ddc/biz-ddc/src/main/kotlin/com/tencent/bkrepo/ddc/pojo/BatchOpsResponse.kt @@ -31,6 +31,7 @@ import com.tencent.bkrepo.ddc.serialization.CbFieldType import com.tencent.bkrepo.ddc.serialization.CbObject import com.tencent.bkrepo.ddc.utils.beginUniformArray import com.tencent.bkrepo.ddc.utils.writeInteger +import com.tencent.bkrepo.ddc.utils.writerObject data class BatchOpsResponse( val results: List @@ -41,10 +42,7 @@ data class BatchOpsResponse( results.forEach { writer.beginObject() writer.writeInteger(OpResponse::opId.name, it.opId) - // 移除response CbObject的type与name信息，仅保留其payload - val resPayload = it.response.getView() - resPayload.position(1) - writer.writeField(CbFieldType.Object, OpResponse::response.name, resPayload.remaining()).put(resPayload) + writer.writerObject(OpResponse::response.name, it.response) writer.writeInteger(OpResponse::statusCode.name, it.statusCode) writer.endObject() } diff --git a/src/backend/ddc/biz-ddc/src/main/kotlin/com/tencent/bkrepo/ddc/utils/CbWriterUtils.kt b/src/backend/ddc/biz-ddc/src/main/kotlin/com/tencent/bkrepo/ddc/utils/CbWriterUtils.kt index 1be70035ff..494356f0ba 100644 --- a/src/backend/ddc/biz-ddc/src/main/kotlin/com/tencent/bkrepo/ddc/utils/CbWriterUtils.kt +++ b/src/backend/ddc/biz-ddc/src/main/kotlin/com/tencent/bkrepo/ddc/utils/CbWriterUtils.kt @@ -28,6 +28,7 @@ package com.tencent.bkrepo.ddc.utils import com.tencent.bkrepo.ddc.serialization.CbFieldType +import com.tencent.bkrepo.ddc.serialization.CbObject import com.tencent.bkrepo.ddc.serialization.CbWriterBase import com.tencent.bkrepo.ddc.serialization.VarULong import com.tencent.bkrepo.ddc.utils.BlakeUtils.OUT_LEN @@ -124,3 +125,11 @@ fun CbWriterBase.writeBinary(name: String? = null, value: ByteBuffer) { fun CbWriterBase.writeBinaryArrayValue(value: ByteArray) = writeBinaryValue(ByteBuffer.wrap(value)) fun CbWriterBase.writeBinaryArray(name: String, value: ByteArray) = writeBinary(name, ByteBuffer.wrap(value)) + +fun CbWriterBase.writerObject(name: String, value: CbObject) { + val view = value.getView() + // 由于类型信息已经包含在view中，此处需要跳过类型信息 + view.position(1) + // 写入数据 + writeField(CbFieldType.Object, name, view.remaining()).put(view) +} diff --git a/src/backend/ddc/biz-ddc/src/test/kotlin/com/tencent/bkrepo/ddc/pojo/BatchOpsTest.kt b/src/backend/ddc/biz-ddc/src/test/kotlin/com/tencent/bkrepo/ddc/pojo/BatchOpsTest.kt new file mode 100644 index 0000000000..4d3647f364 --- /dev/null +++ b/src/backend/ddc/biz-ddc/src/test/kotlin/com/tencent/bkrepo/ddc/pojo/BatchOpsTest.kt @@ -0,0 +1,55 @@ +package com.tencent.bkrepo.ddc.pojo + +import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper +import com.tencent.bkrepo.ddc.serialization.CbFieldType +import com.tencent.bkrepo.ddc.serialization.CbObject +import com.tencent.bkrepo.ddc.serialization.CbWriter +import com.tencent.bkrepo.ddc.utils.beginUniformArray +import com.tencent.bkrepo.ddc.utils.writeBool +import com.tencent.bkrepo.ddc.utils.writeInteger +import com.tencent.bkrepo.ddc.utils.writeString +import com.tencent.bkrepo.ddc.utils.writerObject +import org.junit.jupiter.api.Assertions.assertEquals +import org.junit.jupiter.api.Test + +class BatchOpsTest { + @Test + fun test() { + val writer = CbWriter() + writer.beginObject() + writer.beginUniformArray(BatchOps::ops.name, CbFieldType.Object) + writer.beginObject() + writer.writeInteger(BatchOp::opId.name, 0) + writer.writeString(BatchOp::bucket.name, "bucket") + writer.writeString(BatchOp::key.name, "key") + writer.writeString(BatchOp::op.name, Operation.GET.name) + writer.writeBool(BatchOp::resolveAttachments.name, true) + writer.endObject() + + writer.beginObject() + writer.writeInteger(BatchOp::opId.name, 0) + writer.writeString(BatchOp::bucket.name, "bucket") + writer.writeString(BatchOp::key.name, "key") + writer.writeString(BatchOp::op.name, Operation.HEAD.name) + writer.endObject() + + val payload = CbObject.build { innerWriter -> innerWriter.writeString("test", "test value") } + writer.beginObject() + writer.writeInteger(BatchOp::opId.name, 0) + writer.writeString(BatchOp::bucket.name, "bucket") + writer.writeString(BatchOp::key.name, "key") + writer.writeString(BatchOp::op.name, Operation.PUT.name) + writer.writerObject(BatchOp::payload.name, payload) + writer.writeString(BatchOp::payloadHash.name, "test hash") + writer.endObject() + writer.endArray() + writer.endObject() + + val batchOps = BatchOps.deserialize(writer.toByteArray()) + println(batchOps.ops[2].payload!!.toJson(jacksonObjectMapper())) + assertEquals( + "{\"test\":\"test value\"}", + batchOps.ops[2].payload!!.toJson(jacksonObjectMapper()) + ) + } +}