Vendored updated bigtable client.

This commit is contained in:
Riley Karson 2017-06-28 09:54:26 -07:00 committed by Riley Karson
parent 5bceaef26f
commit cfe9e4afb4
4 changed files with 36 additions and 15 deletions

View File

@ -369,3 +369,24 @@ func (iac *InstanceAdminClient) Instances(ctx context.Context) ([]*InstanceInfo,
} }
return is, nil return is, nil
} }
// InstanceInfo returns information about an instance.
func (iac *InstanceAdminClient) InstanceInfo(ctx context.Context, instanceId string) (*InstanceInfo, error) {
ctx = mergeOutgoingMetadata(ctx, iac.md)
req := &btapb.GetInstanceRequest{
Name: "projects/" + iac.project + "/instances/" + instanceId,
}
res, err := iac.iClient.GetInstance(ctx, req)
if err != nil {
return nil, err
}
m := instanceNameRegexp.FindStringSubmatch(res.Name)
if m == nil {
return nil, fmt.Errorf("malformed instance name %q", res.Name)
}
return &InstanceInfo{
Name: m[2],
DisplayName: res.DisplayName,
}, nil
}

View File

@ -73,7 +73,7 @@ func (c *Client) Close() error {
} }
var ( var (
idempotentRetryCodes = []codes.Code{codes.DeadlineExceeded, codes.Unavailable, codes.Aborted, codes.Internal} idempotentRetryCodes = []codes.Code{codes.DeadlineExceeded, codes.Unavailable, codes.Aborted}
isIdempotentRetryCode = make(map[codes.Code]bool) isIdempotentRetryCode = make(map[codes.Code]bool)
retryOptions = []gax.CallOption{ retryOptions = []gax.CallOption{
gax.WithDelayTimeoutSettings(100*time.Millisecond, 2000*time.Millisecond, 1.2), gax.WithDelayTimeoutSettings(100*time.Millisecond, 2000*time.Millisecond, 1.2),

View File

@ -154,7 +154,7 @@ func (stripValueFilter) proto() *btpb.RowFilter {
return &btpb.RowFilter{Filter: &btpb.RowFilter_StripValueTransformer{true}} return &btpb.RowFilter{Filter: &btpb.RowFilter_StripValueTransformer{true}}
} }
// TimestampRangeFilter returns a filter that matches any rows whose timestamp is within the given time bounds. A zero // TimestampRangeFilter returns a filter that matches any cells whose timestamp is within the given time bounds. A zero
// time means no bound. // time means no bound.
// The timestamp will be truncated to millisecond granularity. // The timestamp will be truncated to millisecond granularity.
func TimestampRangeFilter(startTime time.Time, endTime time.Time) Filter { func TimestampRangeFilter(startTime time.Time, endTime time.Time) Filter {
@ -168,7 +168,7 @@ func TimestampRangeFilter(startTime time.Time, endTime time.Time) Filter {
return trf return trf
} }
// TimestampRangeFilterMicros returns a filter that matches any rows whose timestamp is within the given time bounds, // TimestampRangeFilterMicros returns a filter that matches any cells whose timestamp is within the given time bounds,
// specified in units of microseconds since 1 January 1970. A zero value for the end time is interpreted as no bound. // specified in units of microseconds since 1 January 1970. A zero value for the end time is interpreted as no bound.
// The timestamp will be truncated to millisecond granularity. // The timestamp will be truncated to millisecond granularity.
func TimestampRangeFilterMicros(startTime Timestamp, endTime Timestamp) Filter { func TimestampRangeFilterMicros(startTime Timestamp, endTime Timestamp) Filter {
@ -187,10 +187,10 @@ func (trf timestampRangeFilter) String() string {
func (trf timestampRangeFilter) proto() *btpb.RowFilter { func (trf timestampRangeFilter) proto() *btpb.RowFilter {
return &btpb.RowFilter{ return &btpb.RowFilter{
Filter: &btpb.RowFilter_TimestampRangeFilter{ Filter: &btpb.RowFilter_TimestampRangeFilter{
&btpb.TimestampRange{ &btpb.TimestampRange{
int64(trf.startTime.TruncateToMilliseconds()), int64(trf.startTime.TruncateToMilliseconds()),
int64(trf.endTime.TruncateToMilliseconds()), int64(trf.endTime.TruncateToMilliseconds()),
}, },
}} }}
} }
@ -228,8 +228,8 @@ func ValueRangeFilter(start, end []byte) Filter {
} }
type valueRangeFilter struct { type valueRangeFilter struct {
start []byte start []byte
end []byte end []byte
} }
func (vrf valueRangeFilter) String() string { func (vrf valueRangeFilter) String() string {
@ -260,8 +260,8 @@ func ConditionFilter(predicateFilter, trueFilter, falseFilter Filter) Filter {
type conditionFilter struct { type conditionFilter struct {
predicateFilter Filter predicateFilter Filter
trueFilter Filter trueFilter Filter
falseFilter Filter falseFilter Filter
} }
func (cf conditionFilter) String() string { func (cf conditionFilter) String() string {
@ -282,7 +282,7 @@ func (cf conditionFilter) proto() *btpb.RowFilter {
cf.predicateFilter.proto(), cf.predicateFilter.proto(),
tf, tf,
ff, ff,
}}} }}}
} }
// TODO(dsymonds): More filters: sampling // TODO(dsymonds): More filters: sampling

6
vendor/vendor.json vendored
View File

@ -3,10 +3,10 @@
"ignore": "appengine test github.com/hashicorp/nomad/", "ignore": "appengine test github.com/hashicorp/nomad/",
"package": [ "package": [
{ {
"checksumSHA1": "fEobtlzPZ57VXi864qMmblI2gsA=", "checksumSHA1": "NrTYYg3++pBxH1Z8xjVg6ssQTYY=",
"path": "cloud.google.com/go/bigtable", "path": "cloud.google.com/go/bigtable",
"revision": "69931d826ffbbcb4f8451b42d5cf7fc2ac6c7443", "revision": "f6bedb5a8dbce75418580cedf5c2434c78d06cfa",
"revisionTime": "2017-06-09T14:31:37Z" "revisionTime": "2017-06-27T21:12:08Z"
}, },
{ {
"checksumSHA1": "B1HkIrBavSgy6ntVyGr/eNUy44I=", "checksumSHA1": "B1HkIrBavSgy6ntVyGr/eNUy44I=",