fix(agents): lower legacy native agents to Go 1.20.14
This commit is contained in:
6 files changed
+36
-16
No files matched your search
@@ -316,9 +316,13 @@ func runQueryBenchmark(process *agentProcess, duration time.Duration, concurrenc
|
||||
total += value
|
||||
}
|
||||
count := operations.Load()
|
||||
sampleCount := len(merged)
|
||||
if sampleCount < 1 {
|
||||
sampleCount = 1
|
||||
}
|
||||
return benchmarkResult{
|
||||
Concurrency: concurrency, Operations: count, Errors: failures.Load(), DurationMS: float64(elapsed.Microseconds()) / 1000,
|
||||
QPS: float64(count) / elapsed.Seconds(), MeanMS: total / float64(max(1, len(merged))),
|
||||
QPS: float64(count) / elapsed.Seconds(), MeanMS: total / float64(sampleCount),
|
||||
P50MS: percentile(merged, 0.50), P95MS: percentile(merged, 0.95), P99MS: percentile(merged, 0.99),
|
||||
PeakRSSKB: peakRSS.Load(),
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
module github.com/t8y2/dbx/agents/drivers/kingbase-go
|
||||
|
||||
go 1.22
|
||||
go 1.20
|
||||
|
||||
require gitea.com/kingbase/gokb v0.0.0-20201021123113-29bd62a876c3
|
||||
@@ -880,11 +880,27 @@ func (s *server) closeAllQuerySessions() {
|
||||
}
|
||||
}
|
||||
|
||||
// minInt/maxInt replace the Go 1.21 builtins so the module stays go 1.20
|
||||
// compatible for the Windows 7 toolchain build.
|
||||
func minInt(a, b int) int {
|
||||
if a < b {
|
||||
return a
|
||||
}
|
||||
return b
|
||||
}
|
||||
|
||||
func maxInt(a, b int) int {
|
||||
if a > b {
|
||||
return a
|
||||
}
|
||||
return b
|
||||
}
|
||||
|
||||
func readQuerySessionPage(session *querySession, pageSize int) (queryPageResult, error) {
|
||||
if pageSize <= 0 {
|
||||
pageSize = 100
|
||||
}
|
||||
capacity := min(pageSize, session.remaining)
|
||||
capacity := minInt(pageSize, session.remaining)
|
||||
result := queryPageResult{Columns: session.columns, ColumnTypes: session.columnTypes, Rows: make([][]any, 0, capacity)}
|
||||
for len(result.Rows) < pageSize && session.remaining > 0 {
|
||||
if session.pending != nil {
|
||||
@@ -925,7 +941,7 @@ func readRows(rows *sql.Rows, maxRows int) (queryResult, error) {
|
||||
}
|
||||
columns = nonNilStrings(columns)
|
||||
columnTypes := columnTypeNames(rows)
|
||||
result := queryResult{Columns: columns, ColumnTypes: columnTypes, Rows: make([][]any, 0, min(maxRows, 1024))}
|
||||
result := queryResult{Columns: columns, ColumnTypes: columnTypes, Rows: make([][]any, 0, minInt(maxRows, 1024))}
|
||||
for rows.Next() {
|
||||
if len(result.Rows) >= maxRows {
|
||||
result.Truncated = true
|
||||
@@ -1814,7 +1830,7 @@ func hasTopLevelSQLKeyword(sqlText string, index int, target string) bool {
|
||||
case '(':
|
||||
depth++
|
||||
case ')':
|
||||
depth = max(depth-1, 0)
|
||||
depth = maxInt(depth-1, 0)
|
||||
default:
|
||||
if depth == 0 && isSQLWordStartByte(sqlText[index]) {
|
||||
keyword, next := sqlKeywordAt(sqlText, index)
|
||||
|
||||
@@ -1448,7 +1448,7 @@ func TestListIndexesFallsBackWhenWithOrdinalityIsUnsupported(t *testing.T) {
|
||||
server := newServer()
|
||||
server.db = openMetadataDB(t, state)
|
||||
|
||||
for range 2 {
|
||||
for i := 0; i < 2; i++ {
|
||||
indexes, err := server.listIndexes("PUBLIC", "orders")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
@@ -1939,7 +1939,7 @@ func TestListTriggerDefinitionsFallsBackToSingleArgument(t *testing.T) {
|
||||
server := newServer()
|
||||
server.db = openMetadataDB(t, state)
|
||||
|
||||
for range 2 {
|
||||
for i := 0; i < 2; i++ {
|
||||
definitions, err := server.listTriggerDefinitions("PUBLIC", "orders")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
@@ -1973,7 +1973,7 @@ func TestListTriggersFallsBackToV7InternalPredicate(t *testing.T) {
|
||||
server := newServer()
|
||||
server.db = openMetadataDB(t, state)
|
||||
|
||||
for range 2 {
|
||||
for i := 0; i < 2; i++ {
|
||||
triggers, err := server.listTriggers("PUBLIC", "orders")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
@@ -3442,7 +3442,7 @@ func TestObjectSourceFallsBackToV7RoutineDDLAndCachesChoice(t *testing.T) {
|
||||
server := newServer()
|
||||
server.db = openMetadataDB(t, state)
|
||||
|
||||
for range 2 {
|
||||
for i := 0; i < 2; i++ {
|
||||
source, err := server.getObjectSource("PUBLIC", "format_name", "FUNCTION")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
@@ -4274,7 +4274,7 @@ func TestSchemaConnSkipsInitialAndRepeatedEmptySchema(t *testing.T) {
|
||||
server := newServer()
|
||||
server.db = db
|
||||
|
||||
for range 2 {
|
||||
for i := 0; i < 2; i++ {
|
||||
conn, err := server.schemaConn(context.Background(), "")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
@@ -4400,7 +4400,7 @@ func TestExecuteQueryReappliesSchemaForRepeatedRequests(t *testing.T) {
|
||||
server := newServer()
|
||||
server.db = db
|
||||
|
||||
for range 2 {
|
||||
for i := 0; i < 2; i++ {
|
||||
if _, err := server.executeQuery(queryOptions{SQL: "SELECT 1", Schema: "sdy_smartsite", MaxRows: 10}); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user