修改bug

client/client_query_response.go

@@ -25,7 +25,7 @@ func FormEventInfo(info *response.EventInfo) *EventInfo {
 		Operation:  info.Operation,
 		Value:      info.Value,
 		CreatorID:  info.CreatorID,
-		CreateTime: time.Unix(0, info.CreateTimeUnixNano).Local(),
+		CreateTime: time.Unix(info.CreateTimeUnix, 0).Local(),
 	}
 }
 

dpsv1/client.go

@@ -793,7 +793,7 @@ func (c *Client) formTableRow(tableRow map[string]any) (*request.TableRow, error
 		switch valueType.Name() {
 		case "Time":
 			timeObj := value.(time.Time)
-			typedValue.TypedValue = &request.ColumnValue_Uint64Value{Uint64Value: uint64(timeObj.UnixNano())}
+			typedValue.TypedValue = &request.ColumnValue_Uint64Value{Uint64Value: uint64(timeObj.Unix())}
 		case "string":
 			typedValue.TypedValue = &request.ColumnValue_StringValue{StringValue: value.(string)}
 		case "bool":
@@ -842,7 +842,7 @@ func (c *Client) infoDataToInfoMap(infoData *response.InfoData) (map[string]any,
 		typeStr := column.Value.Type
 
 		if typeStr == "Time" {
-			timeObj := time.Unix(0, int64(column.Value.GetUint64Value()))
+			timeObj := time.Unix(int64(column.Value.GetUint64Value()), 0)
 			retInfoMap[column.Name] = timeObj
 		} else if typeStr == "string" {
 			retInfoMap[column.Name] = column.Value.GetStringValue()

pb/v1/response/event_query.pb.go

@@ -214,12 +214,12 @@ type EventInfo struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Key                string `protobuf:"bytes,1,opt,name=Key,proto3" json:"Key,omitempty"`
-	Version            string `protobuf:"bytes,2,opt,name=Version,proto3" json:"Version,omitempty"`
-	Operation          string `protobuf:"bytes,3,opt,name=Operation,proto3" json:"Operation,omitempty"`
-	Value              string `protobuf:"bytes,4,opt,name=Value,proto3" json:"Value,omitempty"`
-	CreatorID          string `protobuf:"bytes,5,opt,name=CreatorID,proto3" json:"CreatorID,omitempty"`
-	CreateTimeUnixNano int64  `protobuf:"varint,6,opt,name=CreateTimeUnixNano,proto3" json:"CreateTimeUnixNano,omitempty"`
+	Key            string `protobuf:"bytes,1,opt,name=Key,proto3" json:"Key,omitempty"`
+	Version        string `protobuf:"bytes,2,opt,name=Version,proto3" json:"Version,omitempty"`
+	Operation      string `protobuf:"bytes,3,opt,name=Operation,proto3" json:"Operation,omitempty"`
+	Value          string `protobuf:"bytes,4,opt,name=Value,proto3" json:"Value,omitempty"`
+	CreatorID      string `protobuf:"bytes,5,opt,name=CreatorID,proto3" json:"CreatorID,omitempty"`
+	CreateTimeUnix int64  `protobuf:"varint,6,opt,name=CreateTimeUnix,proto3" json:"CreateTimeUnix,omitempty"`
 }
 
 func (x *EventInfo) Reset() {
@@ -289,9 +289,9 @@ func (x *EventInfo) GetCreatorID() string {
 	return ""
 }
 
-func (x *EventInfo) GetCreateTimeUnixNano() int64 {
+func (x *EventInfo) GetCreateTimeUnix() int64 {
 	if x != nil {
-		return x.CreateTimeUnixNano
+		return x.CreateTimeUnix
 	}
 	return 0
 }
@@ -323,7 +323,7 @@ var file_v1_response_event_query_proto_rawDesc = []byte{
 	0x73, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x53, 0x74, 0x61, 0x74, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x18,
 	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x53, 0x74, 0x61, 0x74, 0x65, 0x6d, 0x65, 0x6e, 0x74,
 	0x12, 0x14, 0x0a, 0x05, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52,
-	0x05, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0xb9, 0x01, 0x0a, 0x09, 0x45, 0x76, 0x65, 0x6e, 0x74,
+	0x05, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0xb1, 0x01, 0x0a, 0x09, 0x45, 0x76, 0x65, 0x6e, 0x74,
 	0x49, 0x6e, 0x66, 0x6f, 0x12, 0x10, 0x0a, 0x03, 0x4b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28,
 	0x09, 0x52, 0x03, 0x4b, 0x65, 0x79, 0x12, 0x18, 0x0a, 0x07, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f,
 	0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e,
@@ -332,12 +332,12 @@ var file_v1_response_event_query_proto_rawDesc = []byte{
 	0x0a, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x56,
 	0x61, 0x6c, 0x75, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x43, 0x72, 0x65, 0x61, 0x74, 0x6f, 0x72, 0x49,
 	0x44, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x43, 0x72, 0x65, 0x61, 0x74, 0x6f, 0x72,
-	0x49, 0x44, 0x12, 0x2e, 0x0a, 0x12, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65,
-	0x55, 0x6e, 0x69, 0x78, 0x4e, 0x61, 0x6e, 0x6f, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x12,
-	0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x55, 0x6e, 0x69, 0x78, 0x4e, 0x61,
-	0x6e, 0x6f, 0x42, 0x21, 0x5a, 0x1f, 0x64, 0x70, 0x73, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x67, 0x72,
-	0x70, 0x63, 0x5f, 0x61, 0x70, 0x69, 0x2f, 0x70, 0x62, 0x2f, 0x76, 0x31, 0x2f, 0x72, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x49, 0x44, 0x12, 0x26, 0x0a, 0x0e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65,
+	0x55, 0x6e, 0x69, 0x78, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0e, 0x43, 0x72, 0x65, 0x61,
+	0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x55, 0x6e, 0x69, 0x78, 0x42, 0x21, 0x5a, 0x1f, 0x64, 0x70,
+	0x73, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x67, 0x72, 0x70, 0x63, 0x5f, 0x61, 0x70, 0x69, 0x2f, 0x70,
+	0x62, 0x2f, 0x76, 0x31, 0x2f, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x62, 0x06, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (

test/instance/instance_test.go

@@ -92,7 +92,7 @@ func TestTransaction(t *testing.T) {
 		}, &resultMap).
 		assertEqual(id, resultMap["id"], "ID不一致").
 		assertEqual(name, resultMap["name"], "名称不一致").
-		assertEqual(now.UnixMilli(), resultMap["time"].(time.Time).UnixMilli(), "时间不一致").
+		assertEqual(now.Unix(), resultMap["time"].(time.Time).Unix(), "时间不一致").
 		assertEqual(uint64(tableNum), resultMap["table_num"], "表数量不一致").
 		transaction(func(tx client.Transaction) error {
 			statement, err := tx.UpdateTx(&client.UpdateRequest{
@@ -122,7 +122,7 @@ func TestTransaction(t *testing.T) {
 		}, &resultMap).
 		assertEqual(id, resultMap["id"], "ID不一致").
 		assertEqual(newName, resultMap["name"], "名称不一致").
-		assertEqual(newNow.UnixMilli(), resultMap["time"].(time.Time).UnixMilli(), "时间不一致").
+		assertEqual(newNow.Unix(), resultMap["time"].(time.Time).Unix(), "时间不一致").
 		assertEqual(uint64(newTableNum), resultMap["table_num"], "表数量不一致").
 		transaction(func(tx client.Transaction) error {
 			statement, err := tx.UpdateTx(&client.UpdateRequest{
@@ -233,7 +233,7 @@ func TestTransactionBatch(t *testing.T) {
 		}, &resultMap).
 		assertEqual(id1, resultMap["id"], "ID不一致").
 		assertEqual(name1, resultMap["name"], "名称不一致").
-		assertEqual(now1.UnixMilli(), resultMap["time"].(time.Time).UnixMilli(), "时间不一致").
+		assertEqual(now1.Unix(), resultMap["time"].(time.Time).Unix(), "时间不一致").
 		assertEqual(uint64(tableNum1), resultMap["table_num"], "表数量不一致").
 		queryByKeys(&client.QueryByKeysRequest{
 			TablePrefixWithSchema: tablePrefix,
@@ -242,7 +242,7 @@ func TestTransactionBatch(t *testing.T) {
 		}, &resultMap).
 		assertEqual(id2, resultMap["id"], "ID不一致").
 		assertEqual(name2, resultMap["name"], "名称不一致").
-		assertEqual(now2.UnixMilli(), resultMap["time"].(time.Time).UnixMilli(), "时间不一致").
+		assertEqual(now2.Unix(), resultMap["time"].(time.Time).Unix(), "时间不一致").
 		assertEqual(uint64(tableNum2), resultMap["table_num"], "表数量不一致").
 		transaction(func(tx client.Transaction) error {
 			statement, err := tx.DeleteBatchTx(&client.DeleteBatchRequest{
@@ -324,7 +324,7 @@ func TestInsert(t *testing.T) {
 		}, &resultMap).
 		assertEqual(id, resultMap["id"], "ID不一致").
 		assertEqual(name, resultMap["name"], "名称不一致").
-		assertEqual(now.UnixMilli(), resultMap["time"].(time.Time).Local().UnixMilli(), "时间不一致").
+		assertEqual(now.Unix(), resultMap["time"].(time.Time).Local().Unix(), "时间不一致").
 		assertEqual(uint64(tableNum), resultMap["table_num"], "表数量不一致")
 }
 
@@ -390,7 +390,7 @@ func TestInsertBatch(t *testing.T) {
 		assertEqual(1, int(totalCount), "总数不一致").
 		assertEqual(id1, resultsMap[0]["id"], "ID不一致").
 		assertEqual(name1, resultsMap[0]["name"], "名称不一致").
-		assertEqual(now1.UnixMilli(), resultsMap[0]["time"].(time.Time).Local().UnixMilli(), "时间不一致").
+		assertEqual(now1.Unix(), resultsMap[0]["time"].(time.Time).Local().Unix(), "时间不一致").
 		assertEqual(uint64(tableNum1), resultsMap[0]["table_num"], "表数量不一致").
 		commonQuery(&client.CommonQueryRequest{
 			TablePrefixWithSchema: tablePrefix,
@@ -404,7 +404,7 @@ func TestInsertBatch(t *testing.T) {
 		assertEqual(1, int(totalCount), "总数不一致").
 		assertEqual(id2, resultsMap[0]["id"], "ID不一致").
 		assertEqual(name2, resultsMap[0]["name"], "名称不一致").
-		assertEqual(now2.UnixMilli(), resultsMap[0]["time"].(time.Time).Local().UnixMilli(), "时间不一致").
+		assertEqual(now2.Unix(), resultsMap[0]["time"].(time.Time).Local().Unix(), "时间不一致").
 		assertEqual(uint64(tableNum2), resultsMap[0]["table_num"], "表数量不一致").
 		queryOnlyByWhereAndOrderBy(&client.QueryByWhereAndOrderByRequest{
 			TablePrefixWithSchema: tablePrefix,
@@ -417,7 +417,7 @@ func TestInsertBatch(t *testing.T) {
 		}, &resultsMap).
 		assertEqual(id1, resultsMap[0]["id"], "ID不一致").
 		assertEqual(name1, resultsMap[0]["name"], "名称不一致").
-		assertEqual(now1.UnixMilli(), resultsMap[0]["time"].(time.Time).Local().UnixMilli(), "时间不一致").
+		assertEqual(now1.Unix(), resultsMap[0]["time"].(time.Time).Local().Unix(), "时间不一致").
 		assertEqual(uint64(tableNum1), resultsMap[0]["table_num"], "表数量不一致").
 		commonQueryOnly(&client.CommonQueryRequest{
 			TablePrefixWithSchema: tablePrefix,
@@ -430,7 +430,7 @@ func TestInsertBatch(t *testing.T) {
 		}, &resultsMap).
 		assertEqual(id2, resultsMap[0]["id"], "ID不一致").
 		assertEqual(name2, resultsMap[0]["name"], "名称不一致").
-		assertEqual(now2.UnixMilli(), resultsMap[0]["time"].(time.Time).Local().UnixMilli(), "时间不一致").
+		assertEqual(now2.Unix(), resultsMap[0]["time"].(time.Time).Local().Unix(), "时间不一致").
 		assertEqual(uint64(tableNum2), resultsMap[0]["table_num"], "表数量不一致")
 }
 
@@ -489,7 +489,7 @@ func TestUpdate(t *testing.T) {
 		}, &resultMap).
 		assertEqual(id, resultMap["id"], "ID不一致").
 		assertEqual(newName, resultMap["name"], "名称不一致").
-		assertEqual(newNow.UnixMilli(), resultMap["time"].(time.Time).Local().UnixMilli(), "时间不一致").
+		assertEqual(newNow.Unix(), resultMap["time"].(time.Time).Local().Unix(), "时间不一致").
 		assertEqual(uint64(newTableNum), resultMap["table_num"], "表数量不一致")
 }
 
@@ -657,7 +657,7 @@ func TestReply(t *testing.T) {
 		}, &resultMap).
 		assertEqual(id, resultMap["id"], "ID不一致").
 		assertEqual(name, resultMap["name"], "名称不一致").
-		assertEqual(now.UnixMilli(), resultMap["time"].(time.Time).Local().UnixMilli(), "时间不一致").
+		assertEqual(now.Unix(), resultMap["time"].(time.Time).Local().Unix(), "时间不一致").
 		assertEqual(uint64(tableNum), resultMap["table_num"], "表数量不一致")
 }
 

test/v1/v1_test.go

@@ -96,7 +96,7 @@ func TestTransaction(t *testing.T) {
 		}, &resultMap).
 		assertEqual(id, resultMap["id"], "ID不一致").
 		assertEqual(name, resultMap["name"], "名称不一致").
-		assertEqual(now.UnixMilli(), resultMap["time"].(time.Time).UnixMilli(), "时间不一致").
+		assertEqual(now.Unix(), resultMap["time"].(time.Time).Unix(), "时间不一致").
 		assertEqual(uint64(tableNum), resultMap["table_num"], "表数量不一致").
 		transaction(func(tx client.Transaction) error {
 			statement, err := tx.UpdateTx(&client.UpdateRequest{
@@ -126,7 +126,7 @@ func TestTransaction(t *testing.T) {
 		}, &resultMap).
 		assertEqual(id, resultMap["id"], "ID不一致").
 		assertEqual(newName, resultMap["name"], "名称不一致").
-		assertEqual(newNow.UnixMilli(), resultMap["time"].(time.Time).UnixMilli(), "时间不一致").
+		assertEqual(newNow.Unix(), resultMap["time"].(time.Time).Unix(), "时间不一致").
 		assertEqual(uint64(newTableNum), resultMap["table_num"], "表数量不一致").
 		transaction(func(tx client.Transaction) error {
 			statement, err := tx.UpdateTx(&client.UpdateRequest{
@@ -239,7 +239,7 @@ func TestTransactionBatch(t *testing.T) {
 		}, &resultMap).
 		assertEqual(id1, resultMap["id"], "ID不一致").
 		assertEqual(name1, resultMap["name"], "名称不一致").
-		assertEqual(now1.UnixMilli(), resultMap["time"].(time.Time).UnixMilli(), "时间不一致").
+		assertEqual(now1.Unix(), resultMap["time"].(time.Time).Unix(), "时间不一致").
 		assertEqual(uint64(tableNum1), resultMap["table_num"], "表数量不一致").
 		queryByKeys(&client.QueryByKeysRequest{
 			TablePrefixWithSchema: tablePrefix,
@@ -248,7 +248,7 @@ func TestTransactionBatch(t *testing.T) {
 		}, &resultMap).
 		assertEqual(id2, resultMap["id"], "ID不一致").
 		assertEqual(name2, resultMap["name"], "名称不一致").
-		assertEqual(now2.UnixMilli(), resultMap["time"].(time.Time).UnixMilli(), "时间不一致").
+		assertEqual(now2.Unix(), resultMap["time"].(time.Time).Unix(), "时间不一致").
 		assertEqual(uint64(tableNum2), resultMap["table_num"], "表数量不一致").
 		transaction(func(tx client.Transaction) error {
 			statement, err := tx.DeleteBatchTx(&client.DeleteBatchRequest{
@@ -332,7 +332,7 @@ func TestInsert(t *testing.T) {
 		}, &resultMap).
 		assertEqual(id, resultMap["id"], "ID不一致").
 		assertEqual(name, resultMap["name"], "名称不一致").
-		assertEqual(now.UnixMilli(), resultMap["time"].(time.Time).Local().UnixMilli(), "时间不一致").
+		assertEqual(now.Unix(), resultMap["time"].(time.Time).Local().Unix(), "时间不一致").
 		assertEqual(uint64(tableNum), resultMap["table_num"], "表数量不一致")
 }
 
@@ -400,7 +400,7 @@ func TestInsertBatch(t *testing.T) {
 		assertEqual(1, int(totalCount), "总数不一致").
 		assertEqual(id1, resultsMap[0]["id"], "ID不一致").
 		assertEqual(name1, resultsMap[0]["name"], "名称不一致").
-		assertEqual(now1.UnixMilli(), resultsMap[0]["time"].(time.Time).Local().UnixMilli(), "时间不一致").
+		assertEqual(now1.Unix(), resultsMap[0]["time"].(time.Time).Local().Unix(), "时间不一致").
 		assertEqual(uint64(tableNum1), resultsMap[0]["table_num"], "表数量不一致").
 		commonQuery(&client.CommonQueryRequest{
 			TablePrefixWithSchema: tablePrefix,
@@ -414,7 +414,7 @@ func TestInsertBatch(t *testing.T) {
 		assertEqual(1, int(totalCount), "总数不一致").
 		assertEqual(id2, resultsMap[0]["id"], "ID不一致").
 		assertEqual(name2, resultsMap[0]["name"], "名称不一致").
-		assertEqual(now2.UnixMilli(), resultsMap[0]["time"].(time.Time).Local().UnixMilli(), "时间不一致").
+		assertEqual(now2.Unix(), resultsMap[0]["time"].(time.Time).Local().Unix(), "时间不一致").
 		assertEqual(uint64(tableNum2), resultsMap[0]["table_num"], "表数量不一致").
 		queryOnlyByWhereAndOrderBy(&client.QueryByWhereAndOrderByRequest{
 			TablePrefixWithSchema: tablePrefix,
@@ -427,7 +427,7 @@ func TestInsertBatch(t *testing.T) {
 		}, &resultsMap).
 		assertEqual(id1, resultsMap[0]["id"], "ID不一致").
 		assertEqual(name1, resultsMap[0]["name"], "名称不一致").
-		assertEqual(now1.UnixMilli(), resultsMap[0]["time"].(time.Time).Local().UnixMilli(), "时间不一致").
+		assertEqual(now1.Unix(), resultsMap[0]["time"].(time.Time).Local().Unix(), "时间不一致").
 		assertEqual(uint64(tableNum1), resultsMap[0]["table_num"], "表数量不一致").
 		commonQueryOnly(&client.CommonQueryRequest{
 			TablePrefixWithSchema: tablePrefix,
@@ -440,7 +440,7 @@ func TestInsertBatch(t *testing.T) {
 		}, &resultsMap).
 		assertEqual(id2, resultsMap[0]["id"], "ID不一致").
 		assertEqual(name2, resultsMap[0]["name"], "名称不一致").
-		assertEqual(now2.UnixMilli(), resultsMap[0]["time"].(time.Time).Local().UnixMilli(), "时间不一致").
+		assertEqual(now2.Unix(), resultsMap[0]["time"].(time.Time).Local().Unix(), "时间不一致").
 		assertEqual(uint64(tableNum2), resultsMap[0]["table_num"], "表数量不一致")
 }
 
@@ -501,7 +501,7 @@ func TestUpdate(t *testing.T) {
 		}, &resultMap).
 		assertEqual(id, resultMap["id"], "ID不一致").
 		assertEqual(newName, resultMap["name"], "名称不一致").
-		assertEqual(newNow.UnixMilli(), resultMap["time"].(time.Time).Local().UnixMilli(), "时间不一致").
+		assertEqual(newNow.Unix(), resultMap["time"].(time.Time).Local().Unix(), "时间不一致").
 		assertEqual(uint64(newTableNum), resultMap["table_num"], "表数量不一致")
 }
 
@@ -675,7 +675,7 @@ func TestReply(t *testing.T) {
 		}, &resultMap).
 		assertEqual(id, resultMap["id"], "ID不一致").
 		assertEqual(name, resultMap["name"], "名称不一致").
-		assertEqual(now.UnixMilli(), resultMap["time"].(time.Time).Local().UnixMilli(), "时间不一致").
+		assertEqual(now.Unix(), resultMap["time"].(time.Time).Local().Unix(), "时间不一致").
 		assertEqual(uint64(tableNum), resultMap["table_num"], "表数量不一致")
 }