Merge pull request #191 from taosdata/enh/xftan/TD-25867

enh: support varbinary and fix pointer check
taosdata · Sep 19, 2023 · b0f9b69 · b0f9b69
2 parents cab38e7 + a8fdd64
commit b0f9b69
Show file tree

Hide file tree

Showing 20 changed files with 264 additions and 158 deletions.
diff --git a/common/column.go b/common/column.go
@@ -20,6 +20,7 @@ var (
 	NullTime    = reflect.TypeOf(types.NullTime{})
 	NullBool    = reflect.TypeOf(types.NullBool{})
 	NullString  = reflect.TypeOf(types.NullString{})
+	Bytes       = reflect.TypeOf([]byte{})
 	NullJson    = reflect.TypeOf(types.NullJson{})
 	UnknownType = reflect.TypeOf(new(interface{})).Elem()
 )
@@ -40,4 +41,5 @@ var ColumnTypeMap = map[int]reflect.Type{
 	TSDB_DATA_TYPE_NCHAR:     NullString,
 	TSDB_DATA_TYPE_TIMESTAMP: NullTime,
 	TSDB_DATA_TYPE_JSON:      NullJson,
+	TSDB_DATA_TYPE_VARBINARY: Bytes,
 }
diff --git a/common/const.go b/common/const.go
@@ -64,6 +64,7 @@ const (
 	TSDB_DATA_TYPE_UINT_Str      = "INT UNSIGNED"
 	TSDB_DATA_TYPE_UBIGINT_Str   = "BIGINT UNSIGNED"
 	TSDB_DATA_TYPE_JSON_Str      = "JSON"
+	TSDB_DATA_TYPE_VARBINARY_Str = "VARBINARY"
 )
 
 var TypeNameMap = map[int]string{
@@ -83,6 +84,7 @@ var TypeNameMap = map[int]string{
 	TSDB_DATA_TYPE_UINT:      TSDB_DATA_TYPE_UINT_Str,
 	TSDB_DATA_TYPE_UBIGINT:   TSDB_DATA_TYPE_UBIGINT_Str,
 	TSDB_DATA_TYPE_JSON:      TSDB_DATA_TYPE_JSON_Str,
+	TSDB_DATA_TYPE_VARBINARY: TSDB_DATA_TYPE_VARBINARY_Str,
 }
 
 var NameTypeMap = map[string]int{
@@ -102,6 +104,7 @@ var NameTypeMap = map[string]int{
 	TSDB_DATA_TYPE_UINT_Str:      TSDB_DATA_TYPE_UINT,
 	TSDB_DATA_TYPE_UBIGINT_Str:   TSDB_DATA_TYPE_UBIGINT,
 	TSDB_DATA_TYPE_JSON_Str:      TSDB_DATA_TYPE_JSON,
+	TSDB_DATA_TYPE_VARBINARY_Str: TSDB_DATA_TYPE_VARBINARY,
 }
 
 const (

diff --git a/common/param/column.go b/common/param/column.go
@@ -149,6 +149,18 @@ func (c *ColumnType) AddBinary(strMaxLen int) *ColumnType {
 	return c
 }
 
+func (c *ColumnType) AddVarBinary(strMaxLen int) *ColumnType {
+	if c.column >= c.size {
+		return c
+	}
+	c.value[c.column] = &types.ColumnType{
+		Type:   types.TaosVarBinaryType,
+		MaxLen: strMaxLen,
+	}
+	c.column += 1
+	return c
+}
+
 func (c *ColumnType) AddNchar(strMaxLen int) *ColumnType {
 	if c.column >= c.size {
 		return c

diff --git a/common/param/param.go b/common/param/param.go
@@ -111,6 +111,13 @@ func (p *Param) SetBinary(offset int, value []byte) {
 	p.value[offset] = taosTypes.TaosBinary(value)
 }
 
+func (p *Param) SetVarBinary(offset int, value []byte) {
+	if offset >= p.size {
+		return
+	}
+	p.value[offset] = taosTypes.TaosVarBinary(value)
+}
+
 func (p *Param) SetNchar(offset int, value string) {
 	if offset >= p.size {
 		return
@@ -252,6 +259,15 @@ func (p *Param) AddBinary(value []byte) *Param {
 	return p
 }
 
+func (p *Param) AddVarBinary(value []byte) *Param {
+	if p.offset >= p.size {
+		return p
+	}
+	p.value[p.offset] = taosTypes.TaosVarBinary(value)
+	p.offset += 1
+	return p
+}
+
 func (p *Param) AddNchar(value string) *Param {
 	if p.offset >= p.size {
 		return p