Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge/3.0to3.1 #213

Merged
merged 46 commits into from
Nov 9, 2023
Merged

Merge/3.0to3.1 #213

Changes from 2 commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
68f96e2
Merge pull request #175 from taosdata/main
huskar-t Jun 14, 2023
709f4ff
feat: move stmt field to common and add json tag
huskar-t Jul 11, 2023
dbd9a06
fix: get offset after seek
huskar-t Jul 11, 2023
e4f8e72
Merge pull request #182 from taosdata/feat/TD-25182/3.0
huskar-t Jul 11, 2023
5db18bf
enh: support tmq_position tmq_committed tmq_commit_offset_sync tmq_co…
huskar-t Aug 3, 2023
bc8b329
fix: ignore assignment.offset
huskar-t Aug 3, 2023
b99355e
fix: ci
huskar-t Aug 3, 2023
1d3c00f
fix: ci
huskar-t Aug 3, 2023
f59137f
fix: ci
huskar-t Aug 3, 2023
95706b0
fix: ci
huskar-t Aug 3, 2023
d373208
fix: ci
huskar-t Aug 3, 2023
09e8a3e
fix: position judgment error
huskar-t Aug 4, 2023
e792740
Merge pull request #183 from taosdata/enh/xftan/TD-25339
huskar-t Aug 4, 2023
b416fc1
enh: add commit_offset committed position over ws
huskar-t Aug 24, 2023
69a35ed
fix: describe table return 5 columns
huskar-t Aug 24, 2023
cab38e7
Merge pull request #189 from taosdata/enh/xftan/TD-25345
huskar-t Aug 24, 2023
5a614c1
enh: support varbinary and fix pointer check
huskar-t Aug 25, 2023
b7a0ca6
fix: stmt bind varbinary
huskar-t Sep 19, 2023
a8fdd64
fix: varbinary column type default byte array
huskar-t Sep 19, 2023
b0f9b69
Merge pull request #191 from taosdata/enh/xftan/TD-25867
huskar-t Sep 19, 2023
f98e215
fix: add field length to stmt bind param
sunpe Sep 22, 2023
8b83ab2
Merge pull request #196 from taosdata/fix/sunpeng/TD-25348-add-length…
sunpe Sep 22, 2023
c350517
enh: support whitelist
huskar-t Sep 22, 2023
24d812e
Merge pull request #197 from taosdata/enh/TD-25733/whitelist
huskar-t Sep 22, 2023
13aca2b
fix: stmt data length list
huskar-t Sep 25, 2023
b7dcba3
Merge pull request #198 from taosdata/fix/stmt/lengthoffset
sunpe Sep 25, 2023
b87efc2
enh: support taos_set_conn_mode
huskar-t Sep 26, 2023
5ab5921
Merge pull request #199 from taosdata/enh/xftan/TS-4042
huskar-t Sep 26, 2023
fefe825
enh: add api required by ws
sunpe Sep 27, 2023
353c14f
fix: fix build TDengine
huskar-t Sep 28, 2023
b065578
fix: fix build TDengine
huskar-t Sep 28, 2023
bba9cc3
fix: fix build TDengine
huskar-t Sep 28, 2023
9b9dab2
Merge pull request #200 from taosdata/enh/sunpeng/TD-25691-add-interf…
huskar-t Sep 28, 2023
1b47372
enh: support drop user notify
huskar-t Sep 28, 2023
2ec7278
Merge pull request #201 from taosdata/enh/xftan/TS-3926
huskar-t Sep 28, 2023
7bf5254
Merge branch 'main' into merge/xftan/mainto3.0
huskar-t Oct 24, 2023
a3e7562
test: fix tmq test
huskar-t Oct 24, 2023
a3d62aa
Merge pull request #204 from taosdata/merge/xftan/mainto3.0
huskar-t Oct 24, 2023
238c225
enh: support geometry
huskar-t Oct 25, 2023
9e29944
ci: upgrade to ubuntu 2204
huskar-t Oct 25, 2023
c4e277f
fix: stmt varbinary test
huskar-t Oct 25, 2023
9bd79d4
Merge pull request #206 from taosdata/enh/xftan/TD-26332/geometry
huskar-t Oct 25, 2023
30b341b
fix: parse large string length with uint16
huskar-t Nov 8, 2023
2bc55f7
Merge pull request #208 from taosdata/fix/xftan/largestring-3.0
huskar-t Nov 8, 2023
a83526c
Merge remote-tracking branch 'origin/3.0' into merge/3.0to3.1
huskar-t Nov 9, 2023
1a621db
fix: remove unimplemented C methods
huskar-t Nov 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions wrapper/stmt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@ func TaosStmtBindParamBatch(stmt unsafe.Pointer, multiBind [][]driver.Value, bin
*(*C.int8_t)(current) = C.int8_t(0)
}

l := unsafe.Pointer(uintptr(lengthList) + uintptr(i))
l := unsafe.Pointer(uintptr(lengthList) + uintptr(4*i))
*(*C.int32_t)(l) = C.int32_t(1)
}
}
Expand All @@ -369,7 +369,7 @@ func TaosStmtBindParamBatch(stmt unsafe.Pointer, multiBind [][]driver.Value, bin
current := unsafe.Pointer(uintptr(p) + uintptr(i))
*(*C.int8_t)(current) = C.int8_t(value)

l := unsafe.Pointer(uintptr(lengthList) + uintptr(i))
l := unsafe.Pointer(uintptr(lengthList) + uintptr(4*i))
*(*C.int32_t)(l) = C.int32_t(1)
}
}
Expand All @@ -388,7 +388,7 @@ func TaosStmtBindParamBatch(stmt unsafe.Pointer, multiBind [][]driver.Value, bin
current := unsafe.Pointer(uintptr(p) + uintptr(2*i))
*(*C.int16_t)(current) = C.int16_t(value)

l := unsafe.Pointer(uintptr(lengthList) + uintptr(2*i))
l := unsafe.Pointer(uintptr(lengthList) + uintptr(4*i))
*(*C.int32_t)(l) = C.int32_t(2)
}
}
Expand Down Expand Up @@ -426,7 +426,7 @@ func TaosStmtBindParamBatch(stmt unsafe.Pointer, multiBind [][]driver.Value, bin
current := unsafe.Pointer(uintptr(p) + uintptr(8*i))
*(*C.int64_t)(current) = C.int64_t(value)

l := unsafe.Pointer(uintptr(lengthList) + uintptr(8*i))
l := unsafe.Pointer(uintptr(lengthList) + uintptr(4*i))
*(*C.int32_t)(l) = C.int32_t(8)
}
}
Expand All @@ -445,7 +445,7 @@ func TaosStmtBindParamBatch(stmt unsafe.Pointer, multiBind [][]driver.Value, bin
current := unsafe.Pointer(uintptr(p) + uintptr(i))
*(*C.uint8_t)(current) = C.uint8_t(value)

l := unsafe.Pointer(uintptr(lengthList) + uintptr(i))
l := unsafe.Pointer(uintptr(lengthList) + uintptr(4*i))
*(*C.int32_t)(l) = C.int32_t(1)
}
}
Expand All @@ -464,7 +464,7 @@ func TaosStmtBindParamBatch(stmt unsafe.Pointer, multiBind [][]driver.Value, bin
current := unsafe.Pointer(uintptr(p) + uintptr(2*i))
*(*C.uint16_t)(current) = C.uint16_t(value)

l := unsafe.Pointer(uintptr(lengthList) + uintptr(2*i))
l := unsafe.Pointer(uintptr(lengthList) + uintptr(4*i))
*(*C.int32_t)(l) = C.int32_t(2)
}
}
Expand Down Expand Up @@ -502,7 +502,7 @@ func TaosStmtBindParamBatch(stmt unsafe.Pointer, multiBind [][]driver.Value, bin
current := unsafe.Pointer(uintptr(p) + uintptr(8*i))
*(*C.uint64_t)(current) = C.uint64_t(value)

l := unsafe.Pointer(uintptr(lengthList) + uintptr(8*i))
l := unsafe.Pointer(uintptr(lengthList) + uintptr(4*i))
*(*C.int32_t)(l) = C.int32_t(8)
}
}
Expand Down Expand Up @@ -540,7 +540,7 @@ func TaosStmtBindParamBatch(stmt unsafe.Pointer, multiBind [][]driver.Value, bin
current := unsafe.Pointer(uintptr(p) + uintptr(8*i))
*(*C.double)(current) = C.double(value)

l := unsafe.Pointer(uintptr(lengthList) + uintptr(8*i))
l := unsafe.Pointer(uintptr(lengthList) + uintptr(4*i))
*(*C.int32_t)(l) = C.int32_t(8)
}
}
Expand Down Expand Up @@ -614,7 +614,7 @@ func TaosStmtBindParamBatch(stmt unsafe.Pointer, multiBind [][]driver.Value, bin
current := unsafe.Pointer(uintptr(p) + uintptr(8*i))
*(*C.int64_t)(current) = C.int64_t(ts)

l := unsafe.Pointer(uintptr(lengthList) + uintptr(8*i))
l := unsafe.Pointer(uintptr(lengthList) + uintptr(4*i))
*(*C.int32_t)(l) = C.int32_t(8)
}
}
Expand Down