Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
f178e29
feat(bigtable): Add support for logical views
ron-gal Mar 10, 2025
0e8e26a
feat(bigtable): Add support for Materialized Views to admin client
ron-gal Mar 10, 2025
9c05ec9
feat(bigtable) add support for data APIs for Materialized Views
ron-gal Mar 10, 2025
19aa08a
Merge branch 'googleapis:main' into mat_views_data
ron-gal Mar 10, 2025
e964e14
fix(spanner): revert the ALTS bound token enablement (#11799)
rockspore Mar 11, 2025
0fe1ba4
docs(datacatalog): Mark DataCatalog v1beta1 service and corresponding…
gcf-owl-bot[bot] Mar 11, 2025
ef5f294
feat(storage): Add Flush for appendable writes (#11791)
tritone Mar 11, 2025
a02fcb1
chore(main): release 0.119.0 (#11783)
release-please[bot] Mar 11, 2025
072efe4
feat(bigquery): support MetadataCacheMode for ExternalDataConfig (#11…
alvarowolfx Mar 11, 2025
6da48fe
chore(pubsub): bump cloud.google.com/go version (#11806)
hongalex Mar 11, 2025
2fa3130
docs(cloudquotas): improved comment clarity (#11805)
gcf-owl-bot[bot] Mar 11, 2025
0cc176d
feat(pubsub/pstest): support listening on custom address (#11606)
larryanz Mar 11, 2025
f54a7b7
chore(main): release storage 1.51.0 (#11445)
release-please[bot] Mar 11, 2025
46a66e5
chore(all): update deps (#11788)
renovate-bot Mar 12, 2025
e82ea76
chore: skip benchmark for all env (#11811)
alvarowolfx Mar 12, 2025
5ec7cde
fix(bigquery): Increase timeout for storage api test and remove usage…
alvarowolfx Mar 12, 2025
e3e8cb7
feat(bigtable): Add support for logical views (#11792)
ron-gal Mar 12, 2025
d365bc7
feat(storage/control): Add Anywhere cache control APIs (#11807)
gcf-owl-bot[bot] Mar 12, 2025
3c78efb
chore: release main (#11782)
release-please[bot] Mar 12, 2025
1e72d9b
feat(bigtable): Add support for materialized views for admin client (…
ron-gal Mar 12, 2025
dc332e9
Merge branch 'main' into mat_views_data
ron-gal Mar 13, 2025
b684dbe
Merge branch 'main' into mat_views_data
ron-gal Mar 13, 2025
cfe1d5c
Merge branch 'main' into mat_views_data
bhshkh Mar 13, 2025
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
Prev Previous commit
Next Next commit
Merge branch 'main' into mat_views_data
  • Loading branch information
ron-gal committed Mar 13, 2025
commit dc332e9422a5d5f36946942808c2cdfff2793546
46 changes: 25 additions & 21 deletions bigtable/admin.go
Original file line number Diff line number Diff line change
Expand Up @@ -2786,7 +2786,7 @@ func (iac *InstanceAdminClient) CreateLogicalView(ctx context.Context, instanceI

ctx = mergeOutgoingMetadata(ctx, iac.md)
req := &btapb.CreateLogicalViewRequest{
Parent: "projects/" + iac.project + "/instances/" + instanceID,
Parent: instancePrefix(iac.project, instanceID),
LogicalViewId: conf.LogicalViewID,
LogicalView: &btapb.LogicalView{
Query: conf.Query,
Expand All @@ -2806,14 +2806,14 @@ type LogicalViewInfo struct {
LogicalViewID string

Query string
ETag string
}

// LogicalViewInfo retrieves information about a logical view.
func (iac *InstanceAdminClient) LogicalViewInfo(ctx context.Context, instanceID, logicalViewID string) (*LogicalViewInfo, error) {
ctx = mergeOutgoingMetadata(ctx, iac.md)
prefix := instancePrefix(iac.project, instanceID)
req := &btapb.GetLogicalViewRequest{
Name: fmt.Sprintf("projects/%s/instances/%s/logicalViews/%s", iac.project, instanceID, logicalViewID),
Name: logicalViewPath(iac.project, instanceID, logicalViewID),
}
var res *btapb.LogicalView

Expand All @@ -2826,15 +2826,15 @@ func (iac *InstanceAdminClient) LogicalViewInfo(ctx context.Context, instanceID,
if err != nil {
return nil, err
}
return &LogicalViewInfo{LogicalViewID: logicalViewID, Query: res.Query, ETag: res.Etag}, nil
return &LogicalViewInfo{LogicalViewID: strings.TrimPrefix(res.Name, prefix+"/logicalViews/"), Query: res.Query}, nil
}

// LogicalViews returns a list of the logical views in the instance.
func (iac *InstanceAdminClient) LogicalViews(ctx context.Context, instanceID string) ([]LogicalViewInfo, error) {
views := []LogicalViewInfo{}

prefix := instancePrefix(iac.project, instanceID)
req := &btapb.ListLogicalViewsRequest{
Parent: fmt.Sprintf("projects/%s/instances/%s", iac.project, instanceID),
Parent: prefix,
}
var res *btapb.ListLogicalViewsResponse
err := gax.Invoke(ctx, func(ctx context.Context, _ gax.CallSettings) error {
Expand All @@ -2847,7 +2847,7 @@ func (iac *InstanceAdminClient) LogicalViews(ctx context.Context, instanceID str
}

for _, lv := range res.LogicalViews {
views = append(views, LogicalViewInfo{LogicalViewID: lv.LogicalViewId, Query: lv.Query, ETag: lv.Etag})
views = append(views, LogicalViewInfo{LogicalViewID: strings.TrimPrefix(lv.Name, prefix+"/logicalViews/"), Query: lv.Query})
}
return views, nil
}
Expand All @@ -2859,7 +2859,7 @@ func (iac *InstanceAdminClient) UpdateLogicalView(ctx context.Context, instanceI
return errors.New("LogicalViewID is required")
}
lv := &btapb.LogicalView{}
lv.Name = fmt.Sprintf("projects/%s/instances/%s/logicalViews/%s", iac.project, instanceID, conf.LogicalViewID)
lv.Name = logicalViewPath(iac.project, instanceID, conf.LogicalViewID)

updateMask := &field_mask.FieldMask{
Paths: []string{},
Expand Down Expand Up @@ -2887,7 +2887,7 @@ func (iac *InstanceAdminClient) UpdateLogicalView(ctx context.Context, instanceI
func (iac *InstanceAdminClient) DeleteLogicalView(ctx context.Context, instanceID, logicalViewID string) error {
ctx = mergeOutgoingMetadata(ctx, iac.md)
req := &btapb.DeleteLogicalViewRequest{
Name: fmt.Sprintf("projects/%s/instances/%s/logicalViews/%s", iac.project, instanceID, logicalViewID),
Name: logicalViewPath(iac.project, instanceID, logicalViewID),
}
_, err := iac.iClient.DeleteLogicalView(ctx, req)
return err
Expand Down Expand Up @@ -2916,12 +2916,16 @@ func (iac *InstanceAdminClient) CreateMaterializedView(ctx context.Context, inst
}
}
req := &btapb.CreateMaterializedViewRequest{
Parent: "projects/" + iac.project + "/instances/" + instanceID,
Parent: instancePrefix(iac.project, instanceID),
MaterializedViewId: conf.MaterializedViewID,
MaterializedView: mv,
}
_, err := iac.iClient.CreateMaterializedView(ctx, req)
return err
op, err := iac.iClient.CreateMaterializedView(ctx, req)
if err != nil {
return err
}
resp := btapb.MaterializedView{}
return longrunning.InternalNewOperation(iac.lroClient, op).Wait(ctx, &resp)
}

// MaterializedViewInfo contains materialized view metadata. This struct is read-only.
Expand All @@ -2930,14 +2934,14 @@ type MaterializedViewInfo struct {

Query string
DeletionProtection DeletionProtection
ETag string
}

// MaterializedViewInfo retrieves information about a materialized view.
func (iac *InstanceAdminClient) MaterializedViewInfo(ctx context.Context, instanceID, materializedViewID string) (*MaterializedViewInfo, error) {
ctx = mergeOutgoingMetadata(ctx, iac.md)
prefix := instancePrefix(iac.project, instanceID)
req := &btapb.GetMaterializedViewRequest{
Name: fmt.Sprintf("projects/%s/instances/%s/materializedViews/%s", iac.project, instanceID, materializedViewID),
Name: materializedlViewPath(iac.project, instanceID, materializedViewID),
}
var res *btapb.MaterializedView

Expand All @@ -2950,7 +2954,7 @@ func (iac *InstanceAdminClient) MaterializedViewInfo(ctx context.Context, instan
if err != nil {
return nil, err
}
mv := &MaterializedViewInfo{MaterializedViewID: materializedViewID, Query: res.Query, ETag: res.Etag}
mv := &MaterializedViewInfo{MaterializedViewID: strings.TrimPrefix(res.Name, prefix+"/materializedViews/"), Query: res.Query}
if res.DeletionProtection {
mv.DeletionProtection = Protected
} else {
Expand All @@ -2962,9 +2966,9 @@ func (iac *InstanceAdminClient) MaterializedViewInfo(ctx context.Context, instan
// MaterializedViews returns a list of the materialized views in the instance.
func (iac *InstanceAdminClient) MaterializedViews(ctx context.Context, instanceID string) ([]MaterializedViewInfo, error) {
views := []MaterializedViewInfo{}

prefix := instancePrefix(iac.project, instanceID)
req := &btapb.ListMaterializedViewsRequest{
Parent: fmt.Sprintf("projects/%s/instances/%s", iac.project, instanceID),
Parent: prefix,
}
var res *btapb.ListMaterializedViewsResponse
err := gax.Invoke(ctx, func(ctx context.Context, _ gax.CallSettings) error {
Expand All @@ -2977,8 +2981,8 @@ func (iac *InstanceAdminClient) MaterializedViews(ctx context.Context, instanceI
}

for _, mView := range res.MaterializedViews {
mv := MaterializedViewInfo{MaterializedViewID: mView.MaterializedViewId, Query: mView.Query, ETag: mView.Etag}
if res.DeletionProtection {
mv := MaterializedViewInfo{MaterializedViewID: strings.TrimPrefix(mView.Name, prefix+"/materializedViews/"), Query: mView.Query}
if mView.DeletionProtection {
mv.DeletionProtection = Protected
} else {
mv.DeletionProtection = Unprotected
Expand All @@ -2995,7 +2999,7 @@ func (iac *InstanceAdminClient) UpdateMaterializedView(ctx context.Context, inst
return errors.New("MaterializedViewID is required")
}
mv := &btapb.MaterializedView{}
mv.Name = fmt.Sprintf("projects/%s/instances/%s/materializedViews/%s", iac.project, instanceID, conf.MaterializedViewID)
mv.Name = materializedlViewPath(iac.project, instanceID, conf.MaterializedViewID)

updateMask := &field_mask.FieldMask{
Paths: []string{},
Expand Down Expand Up @@ -3035,7 +3039,7 @@ func (iac *InstanceAdminClient) UpdateMaterializedView(ctx context.Context, inst
func (iac *InstanceAdminClient) DeleteMaterializedView(ctx context.Context, instanceID, materializedViewID string) error {
ctx = mergeOutgoingMetadata(ctx, iac.md)
req := &btapb.DeleteMaterializedViewRequest{
Name: fmt.Sprintf("projects/%s/instances/%s/materializedViews/%s", iac.project, instanceID, materializedViewID),
Name: materializedlViewPath(iac.project, instanceID, materializedViewID),
}
_, err := iac.iClient.DeleteMaterializedView(ctx, req)
return err
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.
⌂ 换网址