Renamed inhibit* to exclude*

This commit is contained in:
Yuce Tekol 2017-08-23 04:57:22 +03:00
parent d7bc6c3bd5
commit e89ffcccbd
No known key found for this signature in database
GPG key ID: CB59E46D2FB90573
6 changed files with 63 additions and 63 deletions

View file

@ -115,7 +115,7 @@ Response:
}
```
By default, all bits and attributes (*for `Bitmap` queries only*) are returned. In order to suppress returning bits, set `inhibitBits` query argument to `true`; to suppress returning attributes, set `inhibitAttrs` query argument to `true`.
By default, all bits and attributes (*for `Bitmap` queries only*) are returned. In order to suppress returning bits, set `excludeBits` query argument to `true`; to suppress returning attributes, set `excludeAttrs` query argument to `true`.
### Change index time quantum

View file

@ -229,7 +229,7 @@ func (e *Executor) executeBitmapCall(ctx context.Context, index string, c *pql.C
// If the row label is used then return bitmap attributes.
bm, _ := other.(*Bitmap)
if c.Name == "Bitmap" {
if opt.InhibitAttrs {
if opt.ExcludeAttrs {
bm.Attrs = map[string]interface{}{}
} else {
idx := e.Holder.Index(index)
@ -262,7 +262,7 @@ func (e *Executor) executeBitmapCall(ctx context.Context, index string, c *pql.C
}
}
if opt.InhibitBits {
if opt.ExcludeBits {
bm.segments = []BitmapSegment{}
}
@ -1379,8 +1379,8 @@ type mapResponse struct {
// ExecOptions represents an execution context for a single Execute() call.
type ExecOptions struct {
Remote bool
InhibitAttrs bool
InhibitBits bool
ExcludeAttrs bool
ExcludeBits bool
}
// decodeError returns an error representation of s if s is non-blank.

View file

@ -61,7 +61,7 @@ func TestExecutor_Execute_Bitmap(t *testing.T) {
}
// Inhibit bits.
if res, err := e.Execute(context.Background(), "i", test.MustParse(`Bitmap(rowID=10, frame=f)`), nil, &pilosa.ExecOptions{InhibitBits: true}); err != nil {
if res, err := e.Execute(context.Background(), "i", test.MustParse(`Bitmap(rowID=10, frame=f)`), nil, &pilosa.ExecOptions{ExcludeBits: true}); err != nil {
t.Fatal(err)
} else if bits := res[0].(*pilosa.Bitmap).Bits(); !reflect.DeepEqual(bits, []uint64{}) {
t.Fatalf("unexpected bits: %+v", bits)
@ -70,7 +70,7 @@ func TestExecutor_Execute_Bitmap(t *testing.T) {
}
// Inhibit attributes.
if res, err := e.Execute(context.Background(), "i", test.MustParse(`Bitmap(rowID=10, frame=f)`), nil, &pilosa.ExecOptions{InhibitAttrs: true}); err != nil {
if res, err := e.Execute(context.Background(), "i", test.MustParse(`Bitmap(rowID=10, frame=f)`), nil, &pilosa.ExecOptions{ExcludeAttrs: true}); err != nil {
t.Fatal(err)
} else if bits := res[0].(*pilosa.Bitmap).Bits(); !reflect.DeepEqual(bits, []uint64{3, SliceWidth + 1}) {
t.Fatalf("unexpected bits: %+v", bits)

View file

@ -242,8 +242,8 @@ func (h *Handler) handlePostQuery(w http.ResponseWriter, r *http.Request) {
// Build execution options.
opt := &ExecOptions{
Remote: req.Remote,
InhibitAttrs: req.InhibitAttrs,
InhibitBits: req.InhibitBits,
ExcludeAttrs: req.ExcludeAttrs,
ExcludeBits: req.ExcludeBits,
}
// Parse query string.
@ -259,7 +259,7 @@ func (h *Handler) handlePostQuery(w http.ResponseWriter, r *http.Request) {
resp := &QueryResponse{Results: results, Err: err}
// Fill column attributes if requested.
if req.ColumnAttrs && !req.InhibitBits {
if req.ColumnAttrs && !req.ExcludeBits {
// Consolidate all column ids across all calls.
var columnIDs []uint64
for _, result := range results {
@ -930,8 +930,8 @@ func (h *Handler) readURLQueryRequest(r *http.Request) (*QueryRequest, error) {
Query: query,
Slices: slices,
ColumnAttrs: q.Get("columnAttrs") == "true",
InhibitAttrs: q.Get("inhibitAttrs") == "true",
InhibitBits: q.Get("inhibitBits") == "true",
ExcludeAttrs: q.Get("excludeAttrs") == "true",
ExcludeBits: q.Get("excludeBits") == "true",
}, nil
}
@ -1401,10 +1401,10 @@ type QueryRequest struct {
ColumnAttrs bool
// Do not return row attributes, if true.
InhibitAttrs bool
ExcludeAttrs bool
// Do not return bits, if true.
InhibitBits bool
ExcludeBits bool
// If true, indicates that query is part of a larger distributed query.
// If false, this request is on the originating node.
@ -1417,8 +1417,8 @@ func decodeQueryRequest(pb *internal.QueryRequest) *QueryRequest {
Slices: pb.Slices,
ColumnAttrs: pb.ColumnAttrs,
Remote: pb.Remote,
InhibitAttrs: pb.InhibitAttrs,
InhibitBits: pb.InhibitBits,
ExcludeAttrs: pb.ExcludeAttrs,
ExcludeBits: pb.ExcludeBits,
}
return req

View file

@ -129,8 +129,8 @@ type QueryRequest struct {
Slices []uint64 `protobuf:"varint,2,rep,packed,name=Slices" json:"Slices,omitempty"`
ColumnAttrs bool `protobuf:"varint,3,opt,name=ColumnAttrs,proto3" json:"ColumnAttrs,omitempty"`
Remote bool `protobuf:"varint,5,opt,name=Remote,proto3" json:"Remote,omitempty"`
InhibitAttrs bool `protobuf:"varint,6,opt,name=InhibitAttrs,proto3" json:"InhibitAttrs,omitempty"`
InhibitBits bool `protobuf:"varint,7,opt,name=InhibitBits,proto3" json:"InhibitBits,omitempty"`
ExcludeAttrs bool `protobuf:"varint,6,opt,name=ExcludeAttrs,proto3" json:"ExcludeAttrs,omitempty"`
ExcludeBits bool `protobuf:"varint,7,opt,name=ExcludeBits,proto3" json:"ExcludeBits,omitempty"`
}
func (m *QueryRequest) Reset() { *m = QueryRequest{} }
@ -501,20 +501,20 @@ func (m *QueryRequest) MarshalTo(dAtA []byte) (int, error) {
}
i++
}
if m.InhibitAttrs {
if m.ExcludeAttrs {
dAtA[i] = 0x30
i++
if m.InhibitAttrs {
if m.ExcludeAttrs {
dAtA[i] = 1
} else {
dAtA[i] = 0
}
i++
}
if m.InhibitBits {
if m.ExcludeBits {
dAtA[i] = 0x38
i++
if m.InhibitBits {
if m.ExcludeBits {
dAtA[i] = 1
} else {
dAtA[i] = 0
@ -860,10 +860,10 @@ func (m *QueryRequest) Size() (n int) {
if m.Remote {
n += 2
}
if m.InhibitAttrs {
if m.ExcludeAttrs {
n += 2
}
if m.InhibitBits {
if m.ExcludeBits {
n += 2
}
return n
@ -1829,7 +1829,7 @@ func (m *QueryRequest) Unmarshal(dAtA []byte) error {
m.Remote = bool(v != 0)
case 6:
if wireType != 0 {
return fmt.Errorf("proto: wrong wireType = %d for field InhibitAttrs", wireType)
return fmt.Errorf("proto: wrong wireType = %d for field ExcludeAttrs", wireType)
}
var v int
for shift := uint(0); ; shift += 7 {
@ -1846,10 +1846,10 @@ func (m *QueryRequest) Unmarshal(dAtA []byte) error {
break
}
}
m.InhibitAttrs = bool(v != 0)
m.ExcludeAttrs = bool(v != 0)
case 7:
if wireType != 0 {
return fmt.Errorf("proto: wrong wireType = %d for field InhibitBits", wireType)
return fmt.Errorf("proto: wrong wireType = %d for field ExcludeBits", wireType)
}
var v int
for shift := uint(0); ; shift += 7 {
@ -1866,7 +1866,7 @@ func (m *QueryRequest) Unmarshal(dAtA []byte) error {
break
}
}
m.InhibitBits = bool(v != 0)
m.ExcludeBits = bool(v != 0)
default:
iNdEx = preIndex
skippy, err := skipPublic(dAtA[iNdEx:])
@ -2605,40 +2605,40 @@ func init() { proto.RegisterFile("public.proto", fileDescriptorPublic) }
var fileDescriptorPublic = []byte{
// 589 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x54, 0x5d, 0x8e, 0xd3, 0x30,
0x10, 0xc6, 0x4d, 0xfa, 0x37, 0xed, 0xae, 0x2a, 0x8b, 0x9f, 0x08, 0xa1, 0x2a, 0x8a, 0x78, 0xc8,
0x53, 0x57, 0x5a, 0x0e, 0x80, 0x48, 0xdb, 0x95, 0x22, 0xc4, 0x0a, 0xdc, 0x85, 0xf7, 0x74, 0xd7,
0xda, 0x8d, 0x94, 0xc4, 0xc1, 0x71, 0x04, 0x3d, 0x00, 0x27, 0xe0, 0x85, 0x1b, 0xc0, 0x21, 0x38,
0x10, 0xc6, 0x4d, 0xfa, 0x37, 0xed, 0xae, 0x56, 0x16, 0x3f, 0x11, 0x42, 0x55, 0x14, 0xf1, 0x90,
0xa7, 0xae, 0xb4, 0x1c, 0x00, 0x91, 0xb6, 0x2b, 0x45, 0x88, 0x15, 0xb8, 0x0b, 0xef, 0xd9, 0xd6,
0x5a, 0x22, 0x25, 0x71, 0x70, 0x1c, 0xb1, 0x3d, 0x00, 0x27, 0xe0, 0x85, 0x1b, 0xc0, 0x21, 0x38,
0x00, 0x8f, 0x1c, 0x01, 0x95, 0x8b, 0xa0, 0xb1, 0xe3, 0x26, 0xe5, 0x01, 0xf1, 0xe6, 0xef, 0x1b,
0xcf, 0x64, 0x3e, 0x7f, 0x33, 0x81, 0x69, 0x59, 0x6f, 0xb3, 0xf4, 0x7a, 0x51, 0x4a, 0xa1, 0x04,
0xcf, 0x64, 0x3e, 0x7f, 0x33, 0x81, 0x69, 0x59, 0xdf, 0x64, 0xe9, 0x66, 0x5e, 0x4a, 0xa1, 0x04,
0x1d, 0xa5, 0x85, 0xe2, 0xb2, 0x48, 0xb2, 0x20, 0x82, 0x41, 0x94, 0xaa, 0x3c, 0x29, 0x29, 0x05,
0x37, 0x4a, 0x55, 0xe5, 0x11, 0xdf, 0x09, 0x5d, 0xa6, 0xcf, 0xf4, 0x29, 0xf4, 0x5f, 0x28, 0x25,
0x2b, 0xaf, 0xe7, 0x3b, 0xe1, 0xe4, 0xfc, 0x74, 0x61, 0xf3, 0x16, 0x48, 0x33, 0x13, 0x0c, 0x16,
0xe0, 0xbe, 0x4e, 0x52, 0x49, 0x67, 0xe0, 0xbc, 0xe4, 0x3b, 0x8f, 0xf8, 0x24, 0x74, 0x19, 0x1e,
0xe9, 0x7d, 0xe8, 0x2f, 0x45, 0x5d, 0x28, 0xaf, 0xa7, 0x39, 0x03, 0x82, 0xb7, 0xe0, 0x44, 0xa9,
0xc2, 0x20, 0x13, 0x1f, 0xe2, 0x55, 0x93, 0x60, 0x00, 0x7d, 0x0c, 0xa3, 0xa5, 0xc8, 0xea, 0xbc,
0x88, 0x57, 0x4d, 0xd6, 0x01, 0xd3, 0x27, 0x30, 0xbe, 0x4a, 0x73, 0x5e, 0xa9, 0x24, 0x2f, 0x3d,
0xc7, 0x27, 0xa1, 0xc3, 0x5a, 0x22, 0x58, 0xc3, 0x89, 0xb9, 0x89, 0x5d, 0x6d, 0xb8, 0xa2, 0xa7,
0xd0, 0x3b, 0x54, 0xef, 0xc5, 0xab, 0xff, 0x54, 0xf3, 0x8d, 0x80, 0x8b, 0xa7, 0xae, 0x9c, 0xb1,
0x91, 0x43, 0xc1, 0xbd, 0xda, 0x95, 0xbc, 0xe9, 0x4b, 0x9f, 0xa9, 0x0f, 0x93, 0x8d, 0x92, 0x69,
0x71, 0xfb, 0x2e, 0xc9, 0x6a, 0xae, 0xbb, 0x1a, 0xb3, 0x2e, 0x85, 0x8a, 0xe2, 0x42, 0x99, 0xb0,
0xab, 0x9b, 0x3e, 0x60, 0x54, 0x14, 0x09, 0x91, 0x99, 0x60, 0xdf, 0x27, 0xe1, 0x88, 0xb5, 0x04,
0x9d, 0x03, 0x5c, 0x64, 0x22, 0x69, 0x72, 0x07, 0x3e, 0x09, 0x09, 0xeb, 0x30, 0xc1, 0x19, 0x0c,
0xb1, 0xd3, 0x57, 0x49, 0xd9, 0x6a, 0x23, 0xff, 0xd2, 0xf6, 0x9d, 0xc0, 0xf4, 0x4d, 0xcd, 0xe5,
0x8e, 0xf1, 0xf7, 0x35, 0xaf, 0xb4, 0x07, 0x1a, 0x37, 0x2a, 0x0d, 0xa0, 0x0f, 0x61, 0xb0, 0xc9,
0xd2, 0x6b, 0x6e, 0x5e, 0xca, 0x65, 0x0d, 0x42, 0xad, 0xed, 0x0b, 0x57, 0x5a, 0xeb, 0x88, 0x75,
0x29, 0xcc, 0x64, 0x3c, 0x17, 0xca, 0x8a, 0x69, 0x10, 0x0d, 0x60, 0x1a, 0x17, 0x77, 0xe9, 0x36,
0x55, 0x26, 0x75, 0xa0, 0xa3, 0x47, 0x1c, 0x56, 0x6f, 0xb0, 0x9e, 0xc3, 0xa1, 0xa9, 0xde, 0xa1,
0x82, 0xcf, 0x04, 0x4e, 0x9a, 0xf6, 0xab, 0x52, 0x14, 0x15, 0x47, 0x8f, 0xd6, 0x52, 0x5a, 0x8f,
0xd6, 0x52, 0xd2, 0x33, 0x18, 0x32, 0x5e, 0xd5, 0x99, 0xb2, 0x36, 0x3f, 0x68, 0x9f, 0xc2, 0xe6,
0xd6, 0x99, 0x62, 0xf6, 0x16, 0x7d, 0x0e, 0xa7, 0x47, 0x63, 0x83, 0xba, 0x30, 0xef, 0x51, 0x9b,
0x77, 0x14, 0x67, 0x7f, 0x5d, 0x0f, 0x3e, 0x11, 0x98, 0x74, 0x2a, 0xd3, 0xd0, 0xae, 0x94, 0x6e,
0x6b, 0x72, 0x3e, 0x6b, 0x0b, 0x19, 0x9e, 0xd9, 0x95, 0x9b, 0x02, 0xb9, 0x6c, 0x86, 0x89, 0x5c,
0xa2, 0x85, 0xb8, 0x46, 0xf6, 0xfb, 0x1d, 0x0b, 0x91, 0x66, 0x26, 0x48, 0x3d, 0x18, 0x2e, 0xef,
0x92, 0xe2, 0x96, 0xdf, 0xe8, 0x61, 0x1a, 0x31, 0x0b, 0x83, 0xaf, 0x04, 0x4e, 0xe2, 0xbc, 0x14,
0x52, 0x75, 0xdc, 0x8d, 0x8b, 0x1b, 0xfe, 0xd1, 0xba, 0xab, 0x01, 0xb2, 0x17, 0x32, 0xc9, 0xcd,
0x18, 0x8f, 0x99, 0x01, 0xc8, 0x6a, 0x97, 0xb5, 0xab, 0x2e, 0x33, 0x40, 0xfb, 0x89, 0x6b, 0x59,
0x79, 0xae, 0x99, 0x04, 0x83, 0x70, 0x6e, 0xed, 0x56, 0x56, 0x5e, 0x5f, 0x87, 0x5a, 0x02, 0xe7,
0xf6, 0xb0, 0x96, 0xe8, 0xb5, 0x13, 0x3a, 0xac, 0xc3, 0x44, 0xb3, 0x1f, 0xfb, 0x39, 0xf9, 0xb9,
0x9f, 0x93, 0x5f, 0xfb, 0x39, 0xf9, 0xf2, 0x7b, 0x7e, 0x6f, 0x3b, 0xd0, 0xff, 0xa5, 0x67, 0x7f,
0x02, 0x00, 0x00, 0xff, 0xff, 0xd8, 0x9d, 0xc1, 0x11, 0xa7, 0x04, 0x00, 0x00,
0x2b, 0xaf, 0xe7, 0x3b, 0xe1, 0xe4, 0xe2, 0x74, 0x6e, 0xf3, 0xe6, 0x48, 0x33, 0x13, 0x0c, 0xe6,
0xe0, 0xbe, 0x4e, 0x52, 0x49, 0xcf, 0xc0, 0x79, 0xc9, 0x77, 0x1e, 0xf1, 0x49, 0xe8, 0x32, 0x3c,
0xd2, 0xfb, 0xd0, 0x5f, 0x88, 0xba, 0x50, 0x5e, 0x4f, 0x73, 0x06, 0x04, 0x6f, 0xc1, 0x89, 0x52,
0x85, 0x41, 0x26, 0x3e, 0xc6, 0xcb, 0x26, 0xc1, 0x00, 0xfa, 0x18, 0x46, 0x0b, 0x91, 0xd5, 0x79,
0x11, 0x2f, 0x9b, 0xac, 0x03, 0xa6, 0x4f, 0x60, 0x7c, 0x9d, 0xe6, 0xbc, 0x52, 0x49, 0x5e, 0x7a,
0x8e, 0x4f, 0x42, 0x87, 0xb5, 0x44, 0xb0, 0x82, 0x13, 0x73, 0x13, 0xbb, 0x5a, 0x73, 0x45, 0x4f,
0xa1, 0x77, 0xa8, 0xde, 0x8b, 0x97, 0xff, 0xa9, 0xe6, 0x1b, 0x01, 0x17, 0x4f, 0x5d, 0x39, 0x63,
0x23, 0x87, 0x82, 0x7b, 0xbd, 0x2b, 0x79, 0xd3, 0x97, 0x3e, 0x53, 0x1f, 0x26, 0x6b, 0x25, 0xd3,
0xe2, 0xf6, 0x5d, 0x92, 0xd5, 0x5c, 0x77, 0x35, 0x66, 0x5d, 0x0a, 0x15, 0xc5, 0x85, 0x32, 0x61,
0x57, 0x37, 0x7d, 0xc0, 0xa8, 0x28, 0x12, 0x22, 0x33, 0xc1, 0xbe, 0x4f, 0xc2, 0x11, 0x6b, 0x09,
0x3a, 0x03, 0xb8, 0xcc, 0x44, 0xd2, 0xe4, 0x0e, 0x7c, 0x12, 0x12, 0xd6, 0x61, 0x82, 0x73, 0x18,
0x62, 0xa7, 0xaf, 0x92, 0xb2, 0xd5, 0x46, 0xfe, 0xa5, 0xed, 0x3b, 0x81, 0xe9, 0x9b, 0x9a, 0xcb,
0x1d, 0xe3, 0x1f, 0x6a, 0x5e, 0x69, 0x0f, 0x34, 0x6e, 0x54, 0x1a, 0x40, 0x1f, 0xc2, 0x60, 0x9d,
0xa5, 0x1b, 0x6e, 0x5e, 0xca, 0x65, 0x0d, 0x42, 0xad, 0xed, 0x0b, 0x57, 0x5a, 0xeb, 0x88, 0x75,
0x29, 0xcc, 0x64, 0x3c, 0x17, 0xca, 0x8a, 0x69, 0x10, 0x0d, 0x60, 0xba, 0xba, 0xdb, 0x64, 0xf5,
0x96, 0x9b, 0xd4, 0x81, 0x8e, 0x1e, 0x71, 0x58, 0xbd, 0xc1, 0x7a, 0x0e, 0x87, 0xa6, 0x7a, 0x87,
0x0a, 0x3e, 0x13, 0x38, 0x69, 0xda, 0xaf, 0x4a, 0x51, 0x54, 0x1c, 0x3d, 0x5a, 0x49, 0x69, 0x3d,
0x5a, 0x49, 0x49, 0xcf, 0x61, 0xc8, 0x78, 0x55, 0x67, 0xca, 0xda, 0xfc, 0xa0, 0x7d, 0x0a, 0x9b,
0x5b, 0x67, 0x8a, 0xd9, 0x5b, 0xf4, 0x39, 0x9c, 0x1e, 0x8d, 0x0d, 0xea, 0xc2, 0xbc, 0x47, 0x6d,
0xde, 0x51, 0x9c, 0xfd, 0x75, 0x3d, 0xf8, 0x44, 0x60, 0xd2, 0xa9, 0x4c, 0x43, 0xbb, 0x52, 0xba,
0xad, 0xc9, 0xc5, 0x59, 0x5b, 0xc8, 0xf0, 0xcc, 0xae, 0xdc, 0x14, 0xc8, 0x55, 0x33, 0x4c, 0xe4,
0x0a, 0x2d, 0xc4, 0x35, 0xb2, 0xdf, 0xef, 0x58, 0x88, 0x34, 0x33, 0x41, 0xea, 0xc1, 0x70, 0xf1,
0x3e, 0x29, 0x6e, 0xf9, 0x56, 0x0f, 0xd3, 0x88, 0x59, 0x18, 0x7c, 0x25, 0x70, 0x12, 0xe7, 0xa5,
0x90, 0xaa, 0xe3, 0x6e, 0x5c, 0x6c, 0xf9, 0x9d, 0x75, 0x57, 0x03, 0x64, 0x2f, 0x65, 0x92, 0x9b,
0x31, 0x1e, 0x33, 0x03, 0x90, 0xd5, 0x2e, 0x6b, 0x57, 0x5d, 0x66, 0x80, 0xf6, 0x13, 0xd7, 0xb2,
0xf2, 0x5c, 0x33, 0x09, 0x06, 0xe1, 0xdc, 0xda, 0xad, 0xac, 0xbc, 0xbe, 0x0e, 0xb5, 0x04, 0xce,
0xed, 0x61, 0x2d, 0xd1, 0x6b, 0x27, 0x74, 0x58, 0x87, 0x89, 0xce, 0x7e, 0xec, 0x67, 0xe4, 0xe7,
0x7e, 0x46, 0x7e, 0xed, 0x67, 0xe4, 0xcb, 0xef, 0xd9, 0xbd, 0x9b, 0x81, 0xfe, 0x2f, 0x3d, 0xfb,
0x13, 0x00, 0x00, 0xff, 0xff, 0xd9, 0x81, 0x5d, 0x51, 0xa7, 0x04, 0x00, 0x00,
}

View file

@ -41,8 +41,8 @@ message QueryRequest {
repeated uint64 Slices = 2;
bool ColumnAttrs = 3;
bool Remote = 5;
bool InhibitAttrs = 6;
bool InhibitBits = 7;
bool ExcludeAttrs = 6;
bool ExcludeBits = 7;
}
message QueryResponse {