Added option to get shard nodeId for describe table call

dcherednik · dcherednik · commit 8c05b88806c8 · 2024-11-13T16:09:24.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,5 @@
+* Added `options.WithShardNodesInfo()` experimental option to get shard nodeId for describe table call
+
 ## v3.92.1
 * Added `sugar.WithUserPassword(user,password)` option for `sugar.DSN()` helper
 * Added `sugar.WithSecure(bool)` option for `sugar.DSN()` helper
diff --git a/examples/go.mod b/examples/go.mod
@@ -51,7 +51,7 @@ require (
 	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
 	github.com/syndtr/goleveldb v1.0.0 // indirect
 	github.com/yandex-cloud/go-genproto v0.0.0-20220815090733-4c139c0154e2 // indirect
-	github.com/ydb-platform/ydb-go-genproto v0.0.0-20241022174402-dd276c7f197b // indirect
+	github.com/ydb-platform/ydb-go-genproto v0.0.0-20241112172322-ea1f63298f77 // indirect
 	github.com/ydb-platform/ydb-go-yc-metadata v0.6.1 // indirect
 	golang.org/x/crypto v0.24.0 // indirect
 	golang.org/x/mod v0.17.0 // indirect
diff --git a/examples/go.sum b/examples/go.sum
@@ -1840,8 +1840,8 @@ github.com/ydb-platform/gorm-driver v0.1.3 h1:uewwScbRuCixNPC0LF7gDKvWcB13/iLj76
 github.com/ydb-platform/gorm-driver v0.1.3/go.mod h1:49cSoG5J18muQTiKj4StL2dHs1/dB94OitnHOvetK24=
 github.com/ydb-platform/xorm v0.0.3 h1:MXk42lANB6r/MMLg/XdJfyXJycGUDlCeLiMlLGDKVPw=
 github.com/ydb-platform/xorm v0.0.3/go.mod h1:hFsU7EUF0o3S+l5c0eyP2yPVjJ0d4gsFdqCsyazzwBc=
-github.com/ydb-platform/ydb-go-genproto v0.0.0-20241022174402-dd276c7f197b h1:8yiv/W+1xTdifJh1Stkck0gFJjys9kg0/r86Buljuss=
-github.com/ydb-platform/ydb-go-genproto v0.0.0-20241022174402-dd276c7f197b/go.mod h1:Er+FePu1dNUieD+XTMDduGpQuCPssK5Q4BjF+IIXJ3I=
+github.com/ydb-platform/ydb-go-genproto v0.0.0-20241112172322-ea1f63298f77 h1:LY6cI8cP4B9rrpTleZk95+08kl2gF4rixG7+V/dwL6Q=
+github.com/ydb-platform/ydb-go-genproto v0.0.0-20241112172322-ea1f63298f77/go.mod h1:Er+FePu1dNUieD+XTMDduGpQuCPssK5Q4BjF+IIXJ3I=
 github.com/ydb-platform/ydb-go-sdk-auth-environ v0.3.0 h1:JxSvw+Moont8qCmibP2MjSEIHfkWJLkw0fHZemAk+d0=
 github.com/ydb-platform/ydb-go-sdk-auth-environ v0.3.0/go.mod h1:YzCPoNrTbrXZg9bO2YkbjI6eQLkaRIE9Bq8ponu0g8A=
 github.com/ydb-platform/ydb-go-sdk-prometheus/v2 v2.0.1 h1:Lsir3AC2VQOTlp8UjZY9zQdCVfWvBNHT3hZn+jSGoo0=
diff --git a/go.mod b/go.mod
@@ -6,7 +6,7 @@ require (
 	github.com/golang-jwt/jwt/v4 v4.4.1
 	github.com/google/uuid v1.6.0
 	github.com/jonboulle/clockwork v0.3.0
-	github.com/ydb-platform/ydb-go-genproto v0.0.0-20241022174402-dd276c7f197b
+	github.com/ydb-platform/ydb-go-genproto v0.0.0-20241112172322-ea1f63298f77
 	golang.org/x/net v0.23.0
 	golang.org/x/sync v0.6.0
 	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1
diff --git a/go.sum b/go.sum
@@ -65,8 +65,8 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/ydb-platform/ydb-go-genproto v0.0.0-20241022174402-dd276c7f197b h1:8yiv/W+1xTdifJh1Stkck0gFJjys9kg0/r86Buljuss=
-github.com/ydb-platform/ydb-go-genproto v0.0.0-20241022174402-dd276c7f197b/go.mod h1:Er+FePu1dNUieD+XTMDduGpQuCPssK5Q4BjF+IIXJ3I=
+github.com/ydb-platform/ydb-go-genproto v0.0.0-20241112172322-ea1f63298f77 h1:LY6cI8cP4B9rrpTleZk95+08kl2gF4rixG7+V/dwL6Q=
+github.com/ydb-platform/ydb-go-genproto v0.0.0-20241112172322-ea1f63298f77/go.mod h1:Er+FePu1dNUieD+XTMDduGpQuCPssK5Q4BjF+IIXJ3I=
 go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
 go.uber.org/mock v0.4.0 h1:VcM4ZOtdbR4f6VXfiOpwpVJDL6lCReaZ6mw31wqh7KU=
 go.uber.org/mock v0.4.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc=
diff --git a/internal/table/session.go b/internal/table/session.go
@@ -418,6 +418,7 @@ func processTableStats(resStats *Ydb_Table.TableStats) *options.TableStats {
 	for i, v := range resStats.GetPartitionStats() {
 		partStats[i].RowsEstimate = v.GetRowsEstimate()
 		partStats[i].StoreSize = v.GetStoreSize()
+		partStats[i].LeaderNodeID = v.GetLeaderNodeId()
 	}
 
 	var creationTime, modificationTime time.Time
diff --git a/table/options/models.go b/table/options/models.go
@@ -73,6 +73,7 @@ type TableStats struct {
 type PartitionStats struct {
 	RowsEstimate uint64
 	StoreSize    uint64
+	LeaderNodeID uint32
 }
 
 type ColumnFamily struct {
diff --git a/table/options/options.go b/table/options/options.go
@@ -28,6 +28,12 @@ func WithPartitionStats() DescribeTableOption {
 	}
 }
 
+func WithShardNodesInfo() DescribeTableOption {
+	return func(d *DescribeTableDesc) {
+		d.IncludeShardNodesInfo = true
+	}
+}
+
 type (
 	CreateTableDesc   Ydb_Table.CreateTableRequest
 	CreateTableOption interface {
diff --git a/tests/slo/go.mod b/tests/slo/go.mod
@@ -34,7 +34,7 @@ require (
 	github.com/prometheus/procfs v0.8.0 // indirect
 	github.com/syndtr/goleveldb v1.0.0 // indirect
 	github.com/yandex-cloud/go-genproto v0.0.0-20211115083454-9ca41db5ed9e // indirect
-	github.com/ydb-platform/ydb-go-genproto v0.0.0-20241022174402-dd276c7f197b // indirect
+	github.com/ydb-platform/ydb-go-genproto v0.0.0-20241112172322-ea1f63298f77 // indirect
 	github.com/ydb-platform/ydb-go-yc v0.12.1 // indirect
 	github.com/ydb-platform/ydb-go-yc-metadata v0.6.1 // indirect
 	golang.org/x/net v0.26.0 // indirect
diff --git a/tests/slo/go.sum b/tests/slo/go.sum
@@ -1827,8 +1827,8 @@ github.com/ydb-platform/gorm-driver v0.1.3 h1:uewwScbRuCixNPC0LF7gDKvWcB13/iLj76
 github.com/ydb-platform/gorm-driver v0.1.3/go.mod h1:49cSoG5J18muQTiKj4StL2dHs1/dB94OitnHOvetK24=
 github.com/ydb-platform/xorm v0.0.3 h1:MXk42lANB6r/MMLg/XdJfyXJycGUDlCeLiMlLGDKVPw=
 github.com/ydb-platform/xorm v0.0.3/go.mod h1:hFsU7EUF0o3S+l5c0eyP2yPVjJ0d4gsFdqCsyazzwBc=
-github.com/ydb-platform/ydb-go-genproto v0.0.0-20241022174402-dd276c7f197b h1:8yiv/W+1xTdifJh1Stkck0gFJjys9kg0/r86Buljuss=
-github.com/ydb-platform/ydb-go-genproto v0.0.0-20241022174402-dd276c7f197b/go.mod h1:Er+FePu1dNUieD+XTMDduGpQuCPssK5Q4BjF+IIXJ3I=
+github.com/ydb-platform/ydb-go-genproto v0.0.0-20241112172322-ea1f63298f77 h1:LY6cI8cP4B9rrpTleZk95+08kl2gF4rixG7+V/dwL6Q=
+github.com/ydb-platform/ydb-go-genproto v0.0.0-20241112172322-ea1f63298f77/go.mod h1:Er+FePu1dNUieD+XTMDduGpQuCPssK5Q4BjF+IIXJ3I=
 github.com/ydb-platform/ydb-go-sdk-auth-environ v0.3.0 h1:JxSvw+Moont8qCmibP2MjSEIHfkWJLkw0fHZemAk+d0=
 github.com/ydb-platform/ydb-go-sdk-auth-environ v0.3.0/go.mod h1:YzCPoNrTbrXZg9bO2YkbjI6eQLkaRIE9Bq8ponu0g8A=
 github.com/ydb-platform/ydb-go-yc v0.12.1 h1:qw3Fa+T81+Kpu5Io2vYHJOwcrYrVjgJlT6t/0dOXJrA=

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	+* Added `options.WithShardNodesInfo()` experimental option to get shard nodeId for describe table call
	`2`	`+`
`1`	`3`	`## v3.92.1`
`2`	`4`	* Added `sugar.WithUserPassword(user,password)` option for `sugar.DSN()` helper
`3`	`5`	* Added `sugar.WithSecure(bool)` option for `sugar.DSN()` helper
Original file line number	Diff line number	Diff line change
`@@ -418,6 +418,7 @@ func processTableStats(resStats Ydb_Table.TableStats) options.TableStats {`
`418`	`418`	`for i, v := range resStats.GetPartitionStats() {`
`419`	`419`	`partStats[i].RowsEstimate = v.GetRowsEstimate()`
`420`	`420`	`partStats[i].StoreSize = v.GetStoreSize()`
	`421`	`+ partStats[i].LeaderNodeID = v.GetLeaderNodeId()`
`421`	`422`	`}`
`422`	`423`
`423`	`424`	`var creationTime, modificationTime time.Time`
Original file line number	Diff line number	Diff line change
`@@ -73,6 +73,7 @@ type TableStats struct {`
`73`	`73`	`type PartitionStats struct {`
`74`	`74`	`RowsEstimate uint64`
`75`	`75`	`StoreSize uint64`
	`76`	`+ LeaderNodeID uint32`
`76`	`77`	`}`
`77`	`78`
`78`	`79`	`type ColumnFamily struct {`
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,12 @@ func WithPartitionStats() DescribeTableOption {`
`28`	`28`	`}`
`29`	`29`	`}`
`30`	`30`
	`31`	`+func WithShardNodesInfo() DescribeTableOption {`
	`32`	`+ return func(d *DescribeTableDesc) {`
	`33`	`+ d.IncludeShardNodesInfo = true`
	`34`	`+ }`
	`35`	`+}`
	`36`	`+`
`31`	`37`	`type (`
`32`	`38`	`CreateTableDesc Ydb_Table.CreateTableRequest`
`33`	`39`	`CreateTableOption interface {`