From 2864a851ab9bb8e92f6b0f048ed5f7e0384c04f8 Mon Sep 17 00:00:00 2001 From: Ben Johnson Date: Mon, 12 Apr 2021 13:58:46 -0600 Subject: [PATCH] Fix timestamp Extract() --- executor.go | 6 ++ executor_test.go | 19 +++++- proto/pilosa.pb.go | 146 ++++++++++++++++++++++++------------------ proto/pilosa.proto | 1 + proto/vdsm/vdsm.pb.go | 12 ++-- 5 files changed, 114 insertions(+), 70 deletions(-) diff --git a/executor.go b/executor.go index 0fdc88d0f..e5ef30e28 100644 --- a/executor.go +++ b/executor.go @@ -3969,6 +3969,12 @@ func (t ExtractedTable) ToRows(callback func(*proto.RowResponse) error) error { }, }, } + case time.Time: + col = &proto.ColumnResponse{ + ColumnVal: &proto.ColumnResponse_TimestampVal{ + TimestampVal: r.UTC().Format(time.RFC3339Nano), + }, + } default: return errors.Errorf("unsupported field value: %v (type: %T)", r, r) } diff --git a/executor_test.go b/executor_test.go index 8acb2563f..425a028a7 100644 --- a/executor_test.go +++ b/executor_test.go @@ -4883,6 +4883,13 @@ func TestExecutor_Execute_Extract(t *testing.T) { Set(3, bsidecimal=-1.01) `) + c.CreateField(t, "i", pilosa.IndexOptions{TrackExistence: true}, "timestamp", pilosa.OptFieldTypeTimestamp(pilosa.MinTimestamp, pilosa.MaxTimestamp, pilosa.TimeUnitSeconds)) + c.Query(t, "i", ` + Set(0, timestamp='2000-01-01T00:00:00Z') + Set(1, timestamp='2000-01-01T00:00:01Z') + Set(3, timestamp='2000-01-01T00:00:03Z') + `) + c.CreateField(t, "i", pilosa.IndexOptions{TrackExistence: true}, "bool", pilosa.OptFieldTypeBool()) c.Query(t, "i", ` Set(0, bool=true) @@ -4890,7 +4897,7 @@ func TestExecutor_Execute_Extract(t *testing.T) { Set(3, bool=true) `) - resp := c.Query(t, "i", `Extract(All(), Rows(set), Rows(keyset), Rows(mutex), Rows(keymutex), Rows(time), Rows(keytime), Rows(bsint), Rows(bsidecimal), Rows(bool))`) + resp := c.Query(t, "i", `Extract(All(), Rows(set), Rows(keyset), Rows(mutex), Rows(keymutex), Rows(time), Rows(keytime), Rows(bsint), Rows(bsidecimal), Rows(timestamp), Rows(bool))`) expect := []interface{}{ pilosa.ExtractedTable{ Fields: []pilosa.ExtractedTableField{ @@ -4926,6 +4933,10 @@ func TestExecutor_Execute_Extract(t *testing.T) { Name: "bsidecimal", Type: "decimal", }, + { + Name: "timestamp", + Type: "timestamp", + }, { Name: "bool", Type: "bool", @@ -4951,6 +4962,7 @@ func TestExecutor_Execute_Extract(t *testing.T) { }, int64(1), pql.NewDecimal(1, 2), + time.Date(2000, time.January, 1, 0, 0, 0, 0, time.UTC), true, }, }, @@ -4975,6 +4987,7 @@ func TestExecutor_Execute_Extract(t *testing.T) { }, int64(-1), pql.NewDecimal(100, 2), + time.Date(2000, time.January, 1, 0, 0, 1, 0, time.UTC), false, }, }, @@ -4992,6 +5005,7 @@ func TestExecutor_Execute_Extract(t *testing.T) { nil, nil, nil, + nil, }, }, { @@ -5007,6 +5021,7 @@ func TestExecutor_Execute_Extract(t *testing.T) { []string{}, int64(2), pql.NewDecimal(-101, 2), + time.Date(2000, time.January, 1, 0, 0, 3, 0, time.UTC), true, }, }, @@ -5022,6 +5037,7 @@ func TestExecutor_Execute_Extract(t *testing.T) { nil, nil, nil, + nil, }, }, { @@ -5038,6 +5054,7 @@ func TestExecutor_Execute_Extract(t *testing.T) { nil, nil, nil, + nil, }, }, }, diff --git a/proto/pilosa.pb.go b/proto/pilosa.pb.go index 4cd578f2c..e28570b7d 100644 --- a/proto/pilosa.pb.go +++ b/proto/pilosa.pb.go @@ -380,6 +380,7 @@ type ColumnResponse struct { // *ColumnResponse_StringArrayVal // *ColumnResponse_Float64Val // *ColumnResponse_DecimalVal + // *ColumnResponse_TimestampVal ColumnVal isColumnResponse_ColumnVal `protobuf_oneof:"columnVal"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` @@ -451,6 +452,10 @@ type ColumnResponse_DecimalVal struct { DecimalVal *Decimal `protobuf:"bytes,9,opt,name=decimalVal,proto3,oneof"` } +type ColumnResponse_TimestampVal struct { + TimestampVal string `protobuf:"bytes,10,opt,name=timestampVal,proto3,oneof"` +} + func (*ColumnResponse_StringVal) isColumnResponse_ColumnVal() {} func (*ColumnResponse_Uint64Val) isColumnResponse_ColumnVal() {} @@ -469,6 +474,8 @@ func (*ColumnResponse_Float64Val) isColumnResponse_ColumnVal() {} func (*ColumnResponse_DecimalVal) isColumnResponse_ColumnVal() {} +func (*ColumnResponse_TimestampVal) isColumnResponse_ColumnVal() {} + func (m *ColumnResponse) GetColumnVal() isColumnResponse_ColumnVal { if m != nil { return m.ColumnVal @@ -539,6 +546,13 @@ func (m *ColumnResponse) GetDecimalVal() *Decimal { return nil } +func (m *ColumnResponse) GetTimestampVal() string { + if x, ok := m.GetColumnVal().(*ColumnResponse_TimestampVal); ok { + return x.TimestampVal + } + return "" +} + // XXX_OneofWrappers is for the internal use of the proto package. func (*ColumnResponse) XXX_OneofWrappers() []interface{} { return []interface{}{ @@ -551,6 +565,7 @@ func (*ColumnResponse) XXX_OneofWrappers() []interface{} { (*ColumnResponse_StringArrayVal)(nil), (*ColumnResponse_Float64Val)(nil), (*ColumnResponse_DecimalVal)(nil), + (*ColumnResponse_TimestampVal)(nil), } } @@ -1198,77 +1213,80 @@ func init() { proto.RegisterType((*DeleteIndexResponse)(nil), "pilosa.DeleteIndexResponse") } -func init() { proto.RegisterFile("pilosa.proto", fileDescriptor_ef0691a44d1e275c) } +func init() { + proto.RegisterFile("pilosa.proto", fileDescriptor_ef0691a44d1e275c) +} var fileDescriptor_ef0691a44d1e275c = []byte{ - // 923 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0xdb, 0x72, 0x1b, 0x45, - 0x10, 0xd5, 0x66, 0xd7, 0xba, 0xf4, 0xfa, 0x96, 0x31, 0x31, 0x8b, 0x42, 0x81, 0x32, 0x2e, 0x2a, - 0xa2, 0xa0, 0x9c, 0x20, 0x08, 0x29, 0xc0, 0x29, 0x2a, 0x76, 0x02, 0x72, 0x01, 0x85, 0x32, 0x21, - 0x79, 0xe0, 0x6d, 0x24, 0x8d, 0x9c, 0x2d, 0x56, 0x3b, 0xf2, 0xce, 0xc8, 0x46, 0x3f, 0xc0, 0xff, - 0xf0, 0xcc, 0x0b, 0xdf, 0xc2, 0x97, 0x50, 0x73, 0xdb, 0x8b, 0x2e, 0x24, 0x50, 0xc5, 0x93, 0xa6, - 0xfb, 0x9c, 0xee, 0xe9, 0xd3, 0x3d, 0x33, 0x5a, 0xd8, 0x9e, 0xc5, 0x09, 0x17, 0xf4, 0x78, 0x96, - 0x71, 0xc9, 0x51, 0xdd, 0x58, 0xf8, 0x0b, 0xd8, 0x7b, 0x36, 0x67, 0xd9, 0x62, 0xf0, 0xec, 0x7b, - 0xc2, 0x2e, 0xe7, 0x4c, 0x48, 0xf4, 0x16, 0x6c, 0xc5, 0xe9, 0x98, 0xfd, 0x1a, 0x79, 0x1d, 0xaf, - 0xdb, 0x22, 0xc6, 0x40, 0xfb, 0xe0, 0xcf, 0x2e, 0x93, 0xe8, 0x86, 0xf6, 0xa9, 0x25, 0x3e, 0xb2, - 0xa1, 0xcf, 0x8b, 0xd0, 0x7d, 0xf0, 0xc5, 0x65, 0x62, 0x03, 0xd5, 0x12, 0x7f, 0x05, 0xe1, 0x73, - 0x49, 0xe5, 0x5c, 0x3c, 0xcd, 0x32, 0x9e, 0x21, 0x04, 0xc1, 0x19, 0x1f, 0x33, 0xcd, 0xd8, 0x21, - 0x7a, 0x8d, 0x22, 0x68, 0xfc, 0xc0, 0x84, 0xa0, 0x17, 0xcc, 0x66, 0x77, 0x26, 0xfe, 0xd3, 0x83, - 0x90, 0xf0, 0x6b, 0xc2, 0xc4, 0x8c, 0xa7, 0x82, 0xa1, 0x8f, 0xa1, 0xf1, 0x8a, 0xd1, 0x31, 0xcb, - 0x44, 0xe4, 0x75, 0xfc, 0x6e, 0xd8, 0x43, 0xc7, 0x56, 0xd4, 0x19, 0x4f, 0xe6, 0xd3, 0xf4, 0x3c, - 0x9d, 0x70, 0xe2, 0x28, 0xe8, 0x3e, 0x34, 0x46, 0xda, 0x2d, 0xa2, 0x1b, 0x9a, 0x7d, 0x58, 0x65, - 0xbb, 0xb4, 0xc4, 0xd1, 0xd0, 0x83, 0x4a, 0xb1, 0x91, 0xdf, 0xf1, 0xba, 0x61, 0xef, 0xc0, 0x45, - 0x95, 0x20, 0x52, 0x11, 0xd5, 0x86, 0xe6, 0x78, 0x9e, 0x51, 0x19, 0xf3, 0x34, 0x0a, 0x3a, 0x5e, - 0xd7, 0x27, 0xb9, 0x8d, 0x1f, 0x82, 0x4f, 0xf8, 0x75, 0xb9, 0x16, 0xef, 0x8d, 0x6a, 0xc1, 0xbf, - 0x7b, 0xb0, 0xf3, 0x13, 0x1d, 0x26, 0xec, 0x3f, 0xaa, 0x7f, 0x1f, 0x82, 0x8c, 0x5f, 0x3b, 0xe9, - 0xa1, 0xa3, 0xaa, 0x76, 0x6a, 0xe0, 0xff, 0x10, 0x7b, 0x02, 0x50, 0x94, 0xa2, 0x66, 0x9d, 0xd2, - 0x29, 0xb3, 0xa7, 0x41, 0xaf, 0x75, 0x34, 0x95, 0x54, 0x2e, 0x66, 0x6e, 0xd8, 0xb9, 0x8d, 0x7f, - 0xf3, 0x61, 0xb7, 0xda, 0x0d, 0xf4, 0x1e, 0xb4, 0x84, 0xcc, 0xe2, 0xf4, 0xe2, 0x25, 0xb5, 0xa7, - 0xaa, 0x5f, 0x23, 0x85, 0x4b, 0xe1, 0xf3, 0x38, 0x95, 0x9f, 0x7f, 0xa6, 0x70, 0x95, 0x2f, 0x50, - 0x78, 0xee, 0x42, 0xef, 0x42, 0x33, 0x87, 0x95, 0x40, 0xbf, 0x5f, 0x23, 0xb9, 0x07, 0xb5, 0xa1, - 0x31, 0xe4, 0x3c, 0x51, 0xa0, 0x52, 0xd2, 0xec, 0xd7, 0x88, 0x73, 0x68, 0x2c, 0xe1, 0x43, 0x85, - 0x6d, 0x75, 0xbc, 0xee, 0xb6, 0xc6, 0x8c, 0x03, 0x3d, 0x82, 0x5d, 0xb3, 0xc5, 0xe3, 0x2c, 0xa3, - 0x0b, 0x45, 0xa9, 0x57, 0x9b, 0xf7, 0xa2, 0x40, 0xfb, 0x35, 0xb2, 0x44, 0x56, 0xe1, 0x46, 0x41, - 0x1e, 0xde, 0x58, 0xee, 0x7d, 0x8e, 0xaa, 0xf0, 0x2a, 0x19, 0x75, 0x00, 0x26, 0x09, 0xa7, 0x56, - 0x55, 0xb3, 0xe3, 0x75, 0xbd, 0x7e, 0x8d, 0x94, 0x7c, 0xe8, 0x13, 0x80, 0x31, 0x1b, 0xc5, 0x53, - 0xaa, 0xa5, 0xb5, 0x74, 0xf2, 0x3d, 0x97, 0xfc, 0x89, 0x41, 0x54, 0x48, 0x41, 0x3a, 0x0d, 0xa1, - 0x65, 0x0e, 0xde, 0x4b, 0x9a, 0xe0, 0x07, 0xd0, 0xb0, 0x2c, 0xf5, 0x16, 0x5c, 0xd1, 0x64, 0x6e, - 0x86, 0xe8, 0x13, 0x63, 0x28, 0xaf, 0x18, 0xd1, 0xc4, 0x8c, 0xd0, 0x27, 0xc6, 0xc0, 0x7f, 0x78, - 0xb0, 0x7b, 0x9e, 0x8a, 0x19, 0x1b, 0xc9, 0x7f, 0x7e, 0x4a, 0x3e, 0x2a, 0x5f, 0x4c, 0x55, 0xdc, - 0x4d, 0x57, 0xdc, 0xf9, 0x58, 0xfc, 0x98, 0x7d, 0xc7, 0x16, 0xa2, 0xb8, 0x93, 0x18, 0xb6, 0x27, - 0x71, 0x22, 0x59, 0xf6, 0x4d, 0xcc, 0x92, 0xb1, 0x88, 0xfc, 0x8e, 0xdf, 0x6d, 0x91, 0x8a, 0x4f, - 0x6d, 0x93, 0xc4, 0xd3, 0x58, 0xea, 0x31, 0x06, 0xc4, 0x18, 0xe8, 0x10, 0xea, 0x7c, 0x32, 0x11, - 0x4c, 0xea, 0x09, 0x06, 0xc4, 0x5a, 0x8a, 0x7d, 0xa9, 0xde, 0x2d, 0x3d, 0xb5, 0x16, 0x31, 0x06, - 0xbe, 0x03, 0x61, 0x69, 0x6c, 0xea, 0xf0, 0x5e, 0xd1, 0xc4, 0xdc, 0xb4, 0x80, 0xe8, 0xb5, 0xa2, - 0x94, 0x46, 0x53, 0xa1, 0xb4, 0x2c, 0xe5, 0x02, 0x5a, 0xb9, 0x06, 0x74, 0x17, 0xfc, 0x78, 0x2c, - 0xb4, 0xf6, 0x8d, 0x87, 0x43, 0x31, 0xd0, 0x87, 0x10, 0xfc, 0xc2, 0x16, 0xae, 0x1b, 0x1b, 0xce, - 0x81, 0xa6, 0x9c, 0xd6, 0x21, 0xd0, 0x97, 0xe5, 0x36, 0x6c, 0x9d, 0xeb, 0x66, 0xae, 0xb9, 0x65, - 0xf8, 0x04, 0xd0, 0x59, 0xc6, 0xa8, 0x64, 0x9a, 0xe2, 0x86, 0xb1, 0xee, 0x3e, 0xa2, 0xd2, 0xce, - 0x4d, 0xb3, 0x05, 0xbe, 0x05, 0x07, 0x95, 0x68, 0x73, 0x17, 0xf1, 0x07, 0xb0, 0xf7, 0x2d, 0x93, - 0xaf, 0xcb, 0x88, 0x1f, 0xc2, 0x7e, 0x41, 0xb3, 0xd7, 0xf8, 0xa8, 0x7c, 0x0c, 0xc2, 0xde, 0x4e, - 0x3e, 0x6e, 0xcd, 0x32, 0x18, 0x3e, 0x80, 0x9b, 0x2e, 0x90, 0x09, 0xbb, 0x03, 0x7e, 0x04, 0xa8, - 0xec, 0xb4, 0xf9, 0xee, 0x42, 0x23, 0x36, 0x2e, 0xfb, 0x12, 0x2e, 0x65, 0x74, 0x28, 0xee, 0x02, - 0x7a, 0xc2, 0x12, 0xf6, 0xfa, 0x46, 0x28, 0xd1, 0x15, 0xa6, 0xd9, 0xa9, 0xf7, 0x57, 0x00, 0xf5, - 0x81, 0x4e, 0x8d, 0xfa, 0x10, 0x96, 0xda, 0x82, 0xda, 0xf9, 0xe3, 0xbb, 0xd2, 0xe9, 0xf6, 0xed, - 0xb5, 0x98, 0xed, 0x63, 0x0d, 0x3d, 0x05, 0x28, 0x44, 0xa1, 0x77, 0x1c, 0x79, 0x45, 0x7d, 0xbb, - 0xbd, 0x0e, 0xca, 0xd3, 0x7c, 0x0d, 0x4d, 0xe7, 0x47, 0x6f, 0x2f, 0x33, 0x5d, 0x8a, 0x68, 0x15, - 0xc8, 0x13, 0xf4, 0x21, 0x2c, 0x69, 0x2e, 0x14, 0xad, 0xb6, 0xac, 0x50, 0xb4, 0xa6, 0x49, 0xb8, - 0x86, 0x4e, 0xa0, 0xe9, 0x3e, 0x05, 0x8a, 0x52, 0x96, 0x3e, 0x0e, 0xda, 0x07, 0xe5, 0xff, 0xa0, - 0x3c, 0xf6, 0xbe, 0x87, 0x1e, 0xc3, 0x8e, 0xe3, 0xbe, 0x48, 0x69, 0xb6, 0xd8, 0x9c, 0xe2, 0x96, - 0x03, 0x2a, 0xff, 0x8c, 0xa5, 0x02, 0x06, 0x2b, 0x05, 0x0c, 0xfe, 0x45, 0x01, 0x83, 0xf5, 0x05, - 0x0c, 0xde, 0xa0, 0x80, 0x2f, 0xa1, 0x61, 0xdf, 0x3e, 0x74, 0x58, 0x1c, 0xc6, 0xf2, 0x63, 0xb8, - 0x71, 0xfb, 0xd3, 0xa3, 0x9f, 0xef, 0x5c, 0xc4, 0xf2, 0xd5, 0x7c, 0x78, 0x3c, 0xe2, 0xd3, 0x7b, - 0x86, 0xe4, 0x7e, 0xae, 0x7a, 0xf7, 0xf4, 0x07, 0xdb, 0xb0, 0xae, 0x7f, 0x3e, 0xfd, 0x3b, 0x00, - 0x00, 0xff, 0xff, 0x75, 0x3f, 0x36, 0x94, 0xc7, 0x09, 0x00, 0x00, + // 939 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0x5b, 0x73, 0x1b, 0x35, + 0x14, 0xf6, 0x76, 0x37, 0xbe, 0x9c, 0xcd, 0xad, 0x0a, 0x0d, 0x8b, 0xcb, 0x80, 0xab, 0xc0, 0xd4, + 0x0c, 0x4c, 0x5a, 0x0c, 0xa5, 0x03, 0xa4, 0xc3, 0x34, 0x69, 0xc1, 0x19, 0x60, 0x70, 0x55, 0xda, + 0x07, 0xde, 0x64, 0x5b, 0x4e, 0x77, 0x58, 0xaf, 0x9c, 0x95, 0x9c, 0xe0, 0xff, 0xc4, 0x0b, 0xcf, + 0xbc, 0xf0, 0x5b, 0xf8, 0x25, 0x8c, 0x6e, 0x7b, 0xb1, 0x1d, 0x1a, 0x98, 0xe9, 0x93, 0x75, 0xce, + 0xf7, 0x9d, 0xa3, 0xf3, 0x9d, 0x23, 0xc9, 0x0b, 0x9b, 0xb3, 0x38, 0xe1, 0x82, 0x1e, 0xce, 0x32, + 0x2e, 0x39, 0xaa, 0x1b, 0x0b, 0x7f, 0x09, 0x3b, 0xcf, 0xe6, 0x2c, 0x5b, 0x0c, 0x9e, 0xfd, 0x40, + 0xd8, 0xf9, 0x9c, 0x09, 0x89, 0xde, 0x82, 0x8d, 0x38, 0x1d, 0xb3, 0xdf, 0x22, 0xaf, 0xe3, 0x75, + 0x5b, 0xc4, 0x18, 0x68, 0x17, 0xfc, 0xd9, 0x79, 0x12, 0xdd, 0xd0, 0x3e, 0xb5, 0xc4, 0x07, 0x36, + 0xf4, 0x79, 0x11, 0xba, 0x0b, 0xbe, 0x38, 0x4f, 0x6c, 0xa0, 0x5a, 0xe2, 0xaf, 0x21, 0x7c, 0x2e, + 0xa9, 0x9c, 0x8b, 0xa7, 0x59, 0xc6, 0x33, 0x84, 0x20, 0x38, 0xe1, 0x63, 0xa6, 0x19, 0x5b, 0x44, + 0xaf, 0x51, 0x04, 0x8d, 0x1f, 0x99, 0x10, 0xf4, 0x8c, 0xd9, 0xec, 0xce, 0xc4, 0x7f, 0x79, 0x10, + 0x12, 0x7e, 0x49, 0x98, 0x98, 0xf1, 0x54, 0x30, 0xf4, 0x09, 0x34, 0x5e, 0x31, 0x3a, 0x66, 0x99, + 0x88, 0xbc, 0x8e, 0xdf, 0x0d, 0x7b, 0xe8, 0xd0, 0x8a, 0x3a, 0xe1, 0xc9, 0x7c, 0x9a, 0x9e, 0xa6, + 0x13, 0x4e, 0x1c, 0x05, 0xdd, 0x87, 0xc6, 0x48, 0xbb, 0x45, 0x74, 0x43, 0xb3, 0xf7, 0xab, 0x6c, + 0x97, 0x96, 0x38, 0x1a, 0x7a, 0x50, 0x29, 0x36, 0xf2, 0x3b, 0x5e, 0x37, 0xec, 0xed, 0xb9, 0xa8, + 0x12, 0x44, 0x2a, 0xa2, 0xda, 0xd0, 0x1c, 0xcf, 0x33, 0x2a, 0x63, 0x9e, 0x46, 0x41, 0xc7, 0xeb, + 0xfa, 0x24, 0xb7, 0xf1, 0x43, 0xf0, 0x09, 0xbf, 0x2c, 0xd7, 0xe2, 0x5d, 0xab, 0x16, 0xfc, 0x87, + 0x07, 0x5b, 0x3f, 0xd3, 0x61, 0xc2, 0xfe, 0xa7, 0xfa, 0xf7, 0x21, 0xc8, 0xf8, 0xa5, 0x93, 0x1e, + 0x3a, 0xaa, 0x6a, 0xa7, 0x06, 0xde, 0x84, 0xd8, 0x23, 0x80, 0xa2, 0x14, 0x35, 0xeb, 0x94, 0x4e, + 0x99, 0x3d, 0x0d, 0x7a, 0xad, 0xa3, 0xa9, 0xa4, 0x72, 0x31, 0x73, 0xc3, 0xce, 0x6d, 0xfc, 0xbb, + 0x0f, 0xdb, 0xd5, 0x6e, 0xa0, 0xf7, 0xa0, 0x25, 0x64, 0x16, 0xa7, 0x67, 0x2f, 0xa9, 0x3d, 0x55, + 0xfd, 0x1a, 0x29, 0x5c, 0x0a, 0x9f, 0xc7, 0xa9, 0xfc, 0xe2, 0x73, 0x85, 0xab, 0x7c, 0x81, 0xc2, + 0x73, 0x17, 0x7a, 0x17, 0x9a, 0x39, 0xac, 0x04, 0xfa, 0xfd, 0x1a, 0xc9, 0x3d, 0xa8, 0x0d, 0x8d, + 0x21, 0xe7, 0x89, 0x02, 0x95, 0x92, 0x66, 0xbf, 0x46, 0x9c, 0x43, 0x63, 0x09, 0x1f, 0x2a, 0x6c, + 0xa3, 0xe3, 0x75, 0x37, 0x35, 0x66, 0x1c, 0xe8, 0x11, 0x6c, 0x9b, 0x2d, 0x1e, 0x67, 0x19, 0x5d, + 0x28, 0x4a, 0xbd, 0xda, 0xbc, 0x17, 0x05, 0xda, 0xaf, 0x91, 0x25, 0xb2, 0x0a, 0x37, 0x0a, 0xf2, + 0xf0, 0xc6, 0x72, 0xef, 0x73, 0x54, 0x85, 0x57, 0xc9, 0xa8, 0x03, 0x30, 0x49, 0x38, 0xb5, 0xaa, + 0x9a, 0x1d, 0xaf, 0xeb, 0xf5, 0x6b, 0xa4, 0xe4, 0x43, 0x9f, 0x02, 0x8c, 0xd9, 0x28, 0x9e, 0x52, + 0x2d, 0xad, 0xa5, 0x93, 0xef, 0xb8, 0xe4, 0x4f, 0x0c, 0xa2, 0x42, 0x0a, 0x12, 0xfa, 0x00, 0x36, + 0x65, 0x3c, 0x65, 0x42, 0xd2, 0xe9, 0x4c, 0x05, 0x81, 0xed, 0x75, 0xc5, 0x7b, 0x1c, 0x42, 0xcb, + 0x1c, 0xcf, 0x97, 0x34, 0xc1, 0x0f, 0xa0, 0x61, 0x73, 0xa9, 0x17, 0xe3, 0x82, 0x26, 0x73, 0x33, + 0x6a, 0x9f, 0x18, 0x43, 0x79, 0xc5, 0x88, 0x26, 0x66, 0xd0, 0x3e, 0x31, 0x06, 0xfe, 0xd3, 0x83, + 0xed, 0xd3, 0x54, 0xcc, 0xd8, 0x48, 0xfe, 0xfb, 0x83, 0xf3, 0x71, 0xf9, 0xfa, 0x2a, 0x09, 0x37, + 0x9d, 0x84, 0xd3, 0xb1, 0xf8, 0x29, 0xfb, 0x9e, 0x2d, 0x44, 0x71, 0x73, 0x31, 0x6c, 0x4e, 0xe2, + 0x44, 0xb2, 0xec, 0xdb, 0x98, 0x25, 0x63, 0x11, 0xf9, 0x1d, 0xbf, 0xdb, 0x22, 0x15, 0x9f, 0xda, + 0x26, 0x89, 0xa7, 0xb1, 0xd4, 0xc3, 0x0e, 0x88, 0x31, 0xd0, 0x3e, 0xd4, 0xf9, 0x64, 0x22, 0x98, + 0xd4, 0x73, 0x0e, 0x88, 0xb5, 0x14, 0xfb, 0x5c, 0xbd, 0x6e, 0x7a, 0xb6, 0x2d, 0x62, 0x0c, 0x7c, + 0x07, 0xc2, 0xd2, 0x70, 0xd5, 0x11, 0xbf, 0xa0, 0x89, 0xb9, 0x8f, 0x01, 0xd1, 0x6b, 0x45, 0x29, + 0x0d, 0xb0, 0x42, 0x69, 0x59, 0xca, 0x19, 0xb4, 0x72, 0x0d, 0xe8, 0x2e, 0xf8, 0xf1, 0x58, 0x68, + 0xed, 0x57, 0x1e, 0x21, 0xc5, 0x40, 0x1f, 0x41, 0xf0, 0x2b, 0x5b, 0xb8, 0x6e, 0x5c, 0x71, 0x5a, + 0x34, 0xe5, 0xb8, 0x0e, 0x81, 0xbe, 0x52, 0xb7, 0x61, 0xe3, 0x54, 0x37, 0x73, 0xcd, 0x5d, 0xc4, + 0x47, 0x80, 0x4e, 0x32, 0x46, 0x25, 0xd3, 0x14, 0x37, 0x8c, 0x75, 0xb7, 0x16, 0x95, 0x76, 0x6e, + 0x9a, 0x2d, 0xf0, 0x2d, 0xd8, 0xab, 0x44, 0x9b, 0x1b, 0x8b, 0x3f, 0x84, 0x9d, 0xef, 0x98, 0x7c, + 0x5d, 0x46, 0xfc, 0x10, 0x76, 0x0b, 0x9a, 0xbd, 0xec, 0x07, 0xe5, 0x63, 0x10, 0xf6, 0xb6, 0xf2, + 0x71, 0x6b, 0x96, 0xc1, 0xf0, 0x1e, 0xdc, 0x74, 0x81, 0x4c, 0xd8, 0x1d, 0xf0, 0x23, 0x40, 0x65, + 0xa7, 0xcd, 0x77, 0x17, 0x1a, 0xb1, 0x71, 0xd9, 0xf7, 0x72, 0x29, 0xa3, 0x43, 0x71, 0x17, 0xd0, + 0x13, 0x96, 0xb0, 0xd7, 0x37, 0x42, 0x89, 0xae, 0x30, 0xcd, 0x4e, 0xbd, 0xbf, 0x03, 0xa8, 0x0f, + 0x74, 0x6a, 0xd4, 0x87, 0xb0, 0xd4, 0x16, 0xd4, 0xce, 0x9f, 0xe8, 0x95, 0x4e, 0xb7, 0x6f, 0xaf, + 0xc5, 0x6c, 0x1f, 0x6b, 0xe8, 0x29, 0x40, 0x21, 0x0a, 0xbd, 0xe3, 0xc8, 0x2b, 0xea, 0xdb, 0xed, + 0x75, 0x50, 0x9e, 0xe6, 0x1b, 0x68, 0x3a, 0x3f, 0x7a, 0x7b, 0x99, 0xe9, 0x52, 0x44, 0xab, 0x40, + 0x9e, 0xa0, 0x0f, 0x61, 0x49, 0x73, 0xa1, 0x68, 0xb5, 0x65, 0x85, 0xa2, 0x35, 0x4d, 0xc2, 0x35, + 0x74, 0x04, 0x4d, 0xf7, 0xc1, 0x50, 0x94, 0xb2, 0xf4, 0x09, 0xd1, 0xde, 0x2b, 0xff, 0x53, 0xe5, + 0xb1, 0xf7, 0x3d, 0xf4, 0x18, 0xb6, 0x1c, 0xf7, 0x45, 0x4a, 0xb3, 0xc5, 0xd5, 0x29, 0x6e, 0x39, + 0xa0, 0xf2, 0xff, 0x59, 0x2a, 0x60, 0xb0, 0x52, 0xc0, 0xe0, 0x3f, 0x14, 0x30, 0x58, 0x5f, 0xc0, + 0xe0, 0x1a, 0x05, 0x7c, 0x05, 0x0d, 0xfb, 0xf6, 0xa1, 0xfd, 0xe2, 0x30, 0x96, 0x1f, 0xc3, 0x2b, + 0xb7, 0x3f, 0x3e, 0xf8, 0xe5, 0xce, 0x59, 0x2c, 0x5f, 0xcd, 0x87, 0x87, 0x23, 0x3e, 0xbd, 0x67, + 0x48, 0xee, 0xe7, 0xa2, 0x77, 0x4f, 0x7f, 0xd6, 0x0d, 0xeb, 0xfa, 0xe7, 0xb3, 0x7f, 0x02, 0x00, + 0x00, 0xff, 0xff, 0x74, 0xe6, 0x59, 0x2d, 0xed, 0x09, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. var _ context.Context -var _ grpc.ClientConn +var _ grpc.ClientConnInterface // This is a compile-time assertion to ensure that this generated file // is compatible with the grpc package it is being compiled against. -const _ = grpc.SupportPackageIsVersion4 +const _ = grpc.SupportPackageIsVersion6 // PilosaClient is the client API for Pilosa service. // @@ -1286,10 +1304,10 @@ type PilosaClient interface { } type pilosaClient struct { - cc *grpc.ClientConn + cc grpc.ClientConnInterface } -func NewPilosaClient(cc *grpc.ClientConn) PilosaClient { +func NewPilosaClient(cc grpc.ClientConnInterface) PilosaClient { return &pilosaClient{cc} } diff --git a/proto/pilosa.proto b/proto/pilosa.proto index 80b82de86..9443683e6 100644 --- a/proto/pilosa.proto +++ b/proto/pilosa.proto @@ -53,6 +53,7 @@ message ColumnResponse{ StringArray stringArrayVal = 7; double float64Val = 8; Decimal decimalVal = 9; + string timestampVal = 10; } } diff --git a/proto/vdsm/vdsm.pb.go b/proto/vdsm/vdsm.pb.go index 083d258e8..a62f5c8be 100644 --- a/proto/vdsm/vdsm.pb.go +++ b/proto/vdsm/vdsm.pb.go @@ -706,7 +706,9 @@ func init() { proto.RegisterType((*InspectRequest)(nil), "vdsm.InspectRequest") } -func init() { proto.RegisterFile("vdsm/vdsm.proto", fileDescriptor_3849c3e549495f50) } +func init() { + proto.RegisterFile("vdsm/vdsm.proto", fileDescriptor_3849c3e549495f50) +} var fileDescriptor_3849c3e549495f50 = []byte{ // 719 bytes of a gzipped FileDescriptorProto @@ -759,11 +761,11 @@ var fileDescriptor_3849c3e549495f50 = []byte{ // Reference imports to suppress errors if they are not otherwise used. var _ context.Context -var _ grpc.ClientConn +var _ grpc.ClientConnInterface // This is a compile-time assertion to ensure that this generated file // is compatible with the grpc package it is being compiled against. -const _ = grpc.SupportPackageIsVersion4 +const _ = grpc.SupportPackageIsVersion6 // MoleculaClient is the client API for Molecula service. // @@ -781,10 +783,10 @@ type MoleculaClient interface { } type moleculaClient struct { - cc *grpc.ClientConn + cc grpc.ClientConnInterface } -func NewMoleculaClient(cc *grpc.ClientConn) MoleculaClient { +func NewMoleculaClient(cc grpc.ClientConnInterface) MoleculaClient { return &moleculaClient{cc} }