YQ Connector:Regenerate go protos

2 files changed, 687 insertions, 739 deletions

diff --git a/ydb/library/yql/providers/generic/connector/libgo/service/connector.pb.go b/ydb/library/yql/providers/generic/connector/libgo/service/connector.pb.go
index 5732bbb215f..eb648bb2925 100644
--- a/ydb/library/yql/providers/generic/connector/libgo/service/connector.pb.go
+++ b/ydb/library/yql/providers/generic/connector/libgo/service/connector.pb.go
@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.30.0
+// 	protoc-gen-go v1.31.0
 // 	protoc        v3.19.0
 // source: ydb/library/yql/providers/generic/connector/api/service/connector.proto
 
diff --git a/ydb/library/yql/providers/generic/connector/libgo/service/protos/connector.pb.go b/ydb/library/yql/providers/generic/connector/libgo/service/protos/connector.pb.go
index 129df5e2469..d229e0c3e0d 100644
--- a/ydb/library/yql/providers/generic/connector/libgo/service/protos/connector.pb.go
+++ b/ydb/library/yql/providers/generic/connector/libgo/service/protos/connector.pb.go
@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.30.0
+// 	protoc-gen-go v1.31.0
 // 	protoc        v3.19.0
 // source: ydb/library/yql/providers/generic/connector/api/service/protos/connector.proto
 
@@ -125,21 +125,21 @@ func (TReadSplitsRequest_EFormat) EnumDescriptor() ([]byte, []int) {
 }
 
 // An operation code.
-type TFilter_TComparison_TBinary_EOperation int32
+type TPredicate_TComparison_EOperation int32
 
 const (
-	TFilter_TComparison_TBinary_RESERVED TFilter_TComparison_TBinary_EOperation = 0
-	TFilter_TComparison_TBinary_L        TFilter_TComparison_TBinary_EOperation = 1 // renders to "col < value"
-	TFilter_TComparison_TBinary_LE       TFilter_TComparison_TBinary_EOperation = 2 // renders to "col <= value"
-	TFilter_TComparison_TBinary_EQ       TFilter_TComparison_TBinary_EOperation = 3 // renders to "col = value"
-	TFilter_TComparison_TBinary_NE       TFilter_TComparison_TBinary_EOperation = 4 // renders to "col != value"
-	TFilter_TComparison_TBinary_GE       TFilter_TComparison_TBinary_EOperation = 5 // renders to "col >= value"
-	TFilter_TComparison_TBinary_G        TFilter_TComparison_TBinary_EOperation = 6 // renders to "col > value"
+	TPredicate_TComparison_RESERVED TPredicate_TComparison_EOperation = 0
+	TPredicate_TComparison_L        TPredicate_TComparison_EOperation = 1 // "$column < value"
+	TPredicate_TComparison_LE       TPredicate_TComparison_EOperation = 2 // "$column <= value"
+	TPredicate_TComparison_EQ       TPredicate_TComparison_EOperation = 3 // "$column = value"
+	TPredicate_TComparison_NE       TPredicate_TComparison_EOperation = 4 // "$column != value"
+	TPredicate_TComparison_GE       TPredicate_TComparison_EOperation = 5 // "$column >= value"
+	TPredicate_TComparison_G        TPredicate_TComparison_EOperation = 6 // "$column > value"
 )
 
-// Enum value maps for TFilter_TComparison_TBinary_EOperation.
+// Enum value maps for TPredicate_TComparison_EOperation.
 var (
-	TFilter_TComparison_TBinary_EOperation_name = map[int32]string{
+	TPredicate_TComparison_EOperation_name = map[int32]string{
 		0: "RESERVED",
 		1: "L",
 		2: "LE",
@@ -148,7 +148,7 @@ var (
 		5: "GE",
 		6: "G",
 	}
-	TFilter_TComparison_TBinary_EOperation_value = map[string]int32{
+	TPredicate_TComparison_EOperation_value = map[string]int32{
 		"RESERVED": 0,
 		"L":        1,
 		"LE":       2,
@@ -159,31 +159,31 @@ var (
 	}
 )
 
-func (x TFilter_TComparison_TBinary_EOperation) Enum() *TFilter_TComparison_TBinary_EOperation {
-	p := new(TFilter_TComparison_TBinary_EOperation)
+func (x TPredicate_TComparison_EOperation) Enum() *TPredicate_TComparison_EOperation {
+	p := new(TPredicate_TComparison_EOperation)
 	*p = x
 	return p
 }
 
-func (x TFilter_TComparison_TBinary_EOperation) String() string {
+func (x TPredicate_TComparison_EOperation) String() string {
 	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
 }
 
-func (TFilter_TComparison_TBinary_EOperation) Descriptor() protoreflect.EnumDescriptor {
+func (TPredicate_TComparison_EOperation) Descriptor() protoreflect.EnumDescriptor {
 	return file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_enumTypes[2].Descriptor()
 }
 
-func (TFilter_TComparison_TBinary_EOperation) Type() protoreflect.EnumType {
+func (TPredicate_TComparison_EOperation) Type() protoreflect.EnumType {
 	return &file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_enumTypes[2]
 }
 
-func (x TFilter_TComparison_TBinary_EOperation) Number() protoreflect.EnumNumber {
+func (x TPredicate_TComparison_EOperation) Number() protoreflect.EnumNumber {
 	return protoreflect.EnumNumber(x)
 }
 
-// Deprecated: Use TFilter_TComparison_TBinary_EOperation.Descriptor instead.
-func (TFilter_TComparison_TBinary_EOperation) EnumDescriptor() ([]byte, []int) {
-	return file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_rawDescGZIP(), []int{13, 0, 0, 0}
+// Deprecated: Use TPredicate_TComparison_EOperation.Descriptor instead.
+func (TPredicate_TComparison_EOperation) EnumDescriptor() ([]byte, []int) {
+	return file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_rawDescGZIP(), []int{14, 7, 0}
 }
 
 // TListTablesRequest requests the list of tables in a particular database of the data source
@@ -1179,26 +1179,23 @@ type TContinuation_Description struct {
 
 func (*TContinuation_Description) isTContinuation_Payload() {}
 
-// Filter - a special type to describe a constraint (or a set of constraints) applied to SQL expression:
-// SELECT $columns FROM $table WHERE $filter.
-// It can be also used for the purpose of split pruning.
-type TFilter struct {
+// Expression with value
+// Can be a column, a constant or a result of, for example,
+// some arithmetical operation
+type TExpression struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to Payload:
 	//
-	//	*TFilter_Comparison
-	//	*TFilter_Conjunction
-	//	*TFilter_Disjunction
-	//	*TFilter_Negation
-	//	*TFilter_SubExpr
-	Payload isTFilter_Payload `protobuf_oneof:"payload"`
+	//	*TExpression_TypedValue
+	//	*TExpression_Column
+	Payload isTExpression_Payload `protobuf_oneof:"payload"`
 }
 
-func (x *TFilter) Reset() {
-	*x = TFilter{}
+func (x *TExpression) Reset() {
+	*x = TExpression{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[13]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -1206,13 +1203,13 @@ func (x *TFilter) Reset() {
 	}
 }
 
-func (x *TFilter) String() string {
+func (x *TExpression) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*TFilter) ProtoMessage() {}
+func (*TExpression) ProtoMessage() {}
 
-func (x *TFilter) ProtoReflect() protoreflect.Message {
+func (x *TExpression) ProtoReflect() protoreflect.Message {
 	mi := &file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[13]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -1224,86 +1221,215 @@ func (x *TFilter) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use TFilter.ProtoReflect.Descriptor instead.
-func (*TFilter) Descriptor() ([]byte, []int) {
+// Deprecated: Use TExpression.ProtoReflect.Descriptor instead.
+func (*TExpression) Descriptor() ([]byte, []int) {
 	return file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_rawDescGZIP(), []int{13}
 }
 
-func (m *TFilter) GetPayload() isTFilter_Payload {
+func (m *TExpression) GetPayload() isTExpression_Payload {
 	if m != nil {
 		return m.Payload
 	}
 	return nil
 }
 
-func (x *TFilter) GetComparison() *TFilter_TComparison {
-	if x, ok := x.GetPayload().(*TFilter_Comparison); ok {
-		return x.Comparison
+func (x *TExpression) GetTypedValue() *Ydb.TypedValue {
+	if x, ok := x.GetPayload().(*TExpression_TypedValue); ok {
+		return x.TypedValue
 	}
 	return nil
 }
 
-func (x *TFilter) GetConjunction() *TFilter_TConjunction {
-	if x, ok := x.GetPayload().(*TFilter_Conjunction); ok {
+func (x *TExpression) GetColumn() string {
+	if x, ok := x.GetPayload().(*TExpression_Column); ok {
+		return x.Column
+	}
+	return ""
+}
+
+type isTExpression_Payload interface {
+	isTExpression_Payload()
+}
+
+type TExpression_TypedValue struct {
+	// A scalar value
+	TypedValue *Ydb.TypedValue `protobuf:"bytes,1,opt,name=typed_value,json=typedValue,proto3,oneof"`
+}
+
+type TExpression_Column struct {
+	// A name of another column to compare with
+	Column string `protobuf:"bytes,2,opt,name=column,proto3,oneof"`
+}
+
+func (*TExpression_TypedValue) isTExpression_Payload() {}
+
+func (*TExpression_Column) isTExpression_Payload() {}
+
+// Predicate
+type TPredicate struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// Types that are assignable to Payload:
+	//
+	//	*TPredicate_Negation
+	//	*TPredicate_Conjunction
+	//	*TPredicate_Disjunction
+	//	*TPredicate_Between
+	//	*TPredicate_In
+	//	*TPredicate_IsNull
+	//	*TPredicate_IsNotNull
+	//	*TPredicate_Comparison
+	Payload isTPredicate_Payload `protobuf_oneof:"payload"`
+}
+
+func (x *TPredicate) Reset() {
+	*x = TPredicate{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[14]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *TPredicate) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*TPredicate) ProtoMessage() {}
+
+func (x *TPredicate) ProtoReflect() protoreflect.Message {
+	mi := &file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[14]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use TPredicate.ProtoReflect.Descriptor instead.
+func (*TPredicate) Descriptor() ([]byte, []int) {
+	return file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_rawDescGZIP(), []int{14}
+}
+
+func (m *TPredicate) GetPayload() isTPredicate_Payload {
+	if m != nil {
+		return m.Payload
+	}
+	return nil
+}
+
+func (x *TPredicate) GetNegation() *TPredicate_TNegation {
+	if x, ok := x.GetPayload().(*TPredicate_Negation); ok {
+		return x.Negation
+	}
+	return nil
+}
+
+func (x *TPredicate) GetConjunction() *TPredicate_TConjunction {
+	if x, ok := x.GetPayload().(*TPredicate_Conjunction); ok {
 		return x.Conjunction
 	}
 	return nil
 }
 
-func (x *TFilter) GetDisjunction() *TFilter_TDisjunction {
-	if x, ok := x.GetPayload().(*TFilter_Disjunction); ok {
+func (x *TPredicate) GetDisjunction() *TPredicate_TDisjunction {
+	if x, ok := x.GetPayload().(*TPredicate_Disjunction); ok {
 		return x.Disjunction
 	}
 	return nil
 }
 
-func (x *TFilter) GetNegation() *TFilter_TNegation {
-	if x, ok := x.GetPayload().(*TFilter_Negation); ok {
-		return x.Negation
+func (x *TPredicate) GetBetween() *TPredicate_TBetween {
+	if x, ok := x.GetPayload().(*TPredicate_Between); ok {
+		return x.Between
 	}
 	return nil
 }
 
-func (x *TFilter) GetSubExpr() *TFilter_TSubExpr {
-	if x, ok := x.GetPayload().(*TFilter_SubExpr); ok {
-		return x.SubExpr
+func (x *TPredicate) GetIn() *TPredicate_TIn {
+	if x, ok := x.GetPayload().(*TPredicate_In); ok {
+		return x.In
 	}
 	return nil
 }
 
-type isTFilter_Payload interface {
-	isTFilter_Payload()
+func (x *TPredicate) GetIsNull() *TPredicate_TIsNull {
+	if x, ok := x.GetPayload().(*TPredicate_IsNull); ok {
+		return x.IsNull
+	}
+	return nil
+}
+
+func (x *TPredicate) GetIsNotNull() *TPredicate_TIsNotNull {
+	if x, ok := x.GetPayload().(*TPredicate_IsNotNull); ok {
+		return x.IsNotNull
+	}
+	return nil
+}
+
+func (x *TPredicate) GetComparison() *TPredicate_TComparison {
+	if x, ok := x.GetPayload().(*TPredicate_Comparison); ok {
+		return x.Comparison
+	}
+	return nil
 }
 
-type TFilter_Comparison struct {
-	Comparison *TFilter_TComparison `protobuf:"bytes,1,opt,name=comparison,proto3,oneof"`
+type isTPredicate_Payload interface {
+	isTPredicate_Payload()
 }
 
-type TFilter_Conjunction struct {
-	Conjunction *TFilter_TConjunction `protobuf:"bytes,2,opt,name=conjunction,proto3,oneof"`
+type TPredicate_Negation struct {
+	Negation *TPredicate_TNegation `protobuf:"bytes,1,opt,name=negation,proto3,oneof"`
 }
 
-type TFilter_Disjunction struct {
-	Disjunction *TFilter_TDisjunction `protobuf:"bytes,3,opt,name=disjunction,proto3,oneof"`
+type TPredicate_Conjunction struct {
+	Conjunction *TPredicate_TConjunction `protobuf:"bytes,2,opt,name=conjunction,proto3,oneof"`
 }
 
-type TFilter_Negation struct {
-	Negation *TFilter_TNegation `protobuf:"bytes,4,opt,name=negation,proto3,oneof"`
+type TPredicate_Disjunction struct {
+	Disjunction *TPredicate_TDisjunction `protobuf:"bytes,3,opt,name=disjunction,proto3,oneof"`
 }
 
-type TFilter_SubExpr struct {
-	SubExpr *TFilter_TSubExpr `protobuf:"bytes,5,opt,name=sub_expr,json=subExpr,proto3,oneof"`
+type TPredicate_Between struct {
+	Between *TPredicate_TBetween `protobuf:"bytes,4,opt,name=between,proto3,oneof"`
 }
 
-func (*TFilter_Comparison) isTFilter_Payload() {}
+type TPredicate_In struct {
+	In *TPredicate_TIn `protobuf:"bytes,5,opt,name=in,proto3,oneof"`
+}
+
+type TPredicate_IsNull struct {
+	IsNull *TPredicate_TIsNull `protobuf:"bytes,6,opt,name=is_null,json=isNull,proto3,oneof"`
+}
+
+type TPredicate_IsNotNull struct {
+	IsNotNull *TPredicate_TIsNotNull `protobuf:"bytes,7,opt,name=is_not_null,json=isNotNull,proto3,oneof"`
+}
+
+type TPredicate_Comparison struct {
+	Comparison *TPredicate_TComparison `protobuf:"bytes,8,opt,name=comparison,proto3,oneof"`
+}
+
+func (*TPredicate_Negation) isTPredicate_Payload() {}
+
+func (*TPredicate_Conjunction) isTPredicate_Payload() {}
+
+func (*TPredicate_Disjunction) isTPredicate_Payload() {}
 
-func (*TFilter_Conjunction) isTFilter_Payload() {}
+func (*TPredicate_Between) isTPredicate_Payload() {}
 
-func (*TFilter_Disjunction) isTFilter_Payload() {}
+func (*TPredicate_In) isTPredicate_Payload() {}
 
-func (*TFilter_Negation) isTFilter_Payload() {}
+func (*TPredicate_IsNull) isTPredicate_Payload() {}
 
-func (*TFilter_SubExpr) isTFilter_Payload() {}
+func (*TPredicate_IsNotNull) isTPredicate_Payload() {}
+
+func (*TPredicate_Comparison) isTPredicate_Payload() {}
 
 // Special type to describe the result of any operation
 type TError struct {
@@ -1323,7 +1449,7 @@ type TError struct {
 func (x *TError) Reset() {
 	*x = TError{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[14]
+		mi := &file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[15]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1336,7 +1462,7 @@ func (x *TError) String() string {
 func (*TError) ProtoMessage() {}
 
 func (x *TError) ProtoReflect() protoreflect.Message {
-	mi := &file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[14]
+	mi := &file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[15]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1349,7 +1475,7 @@ func (x *TError) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use TError.ProtoReflect.Descriptor instead.
 func (*TError) Descriptor() ([]byte, []int) {
-	return file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_rawDescGZIP(), []int{14}
+	return file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_rawDescGZIP(), []int{15}
 }
 
 func (x *TError) GetStatus() Ydb.StatusIds_StatusCode {
@@ -1390,7 +1516,7 @@ type TAst struct {
 func (x *TAst) Reset() {
 	*x = TAst{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[15]
+		mi := &file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[16]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1403,7 +1529,7 @@ func (x *TAst) String() string {
 func (*TAst) ProtoMessage() {}
 
 func (x *TAst) ProtoReflect() protoreflect.Message {
-	mi := &file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[15]
+	mi := &file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[16]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1416,7 +1542,7 @@ func (x *TAst) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use TAst.ProtoReflect.Descriptor instead.
 func (*TAst) Descriptor() ([]byte, []int) {
-	return file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_rawDescGZIP(), []int{15}
+	return file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_rawDescGZIP(), []int{16}
 }
 
 func (m *TAst) GetPayload() isTAst_Payload {
@@ -1474,7 +1600,7 @@ type TSelect_TWhat struct {
 func (x *TSelect_TWhat) Reset() {
 	*x = TSelect_TWhat{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[16]
+		mi := &file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[17]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1487,7 +1613,7 @@ func (x *TSelect_TWhat) String() string {
 func (*TSelect_TWhat) ProtoMessage() {}
 
 func (x *TSelect_TWhat) ProtoReflect() protoreflect.Message {
-	mi := &file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[16]
+	mi := &file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[17]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1522,7 +1648,7 @@ type TSelect_TFrom struct {
 func (x *TSelect_TFrom) Reset() {
 	*x = TSelect_TFrom{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[17]
+		mi := &file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[18]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1535,7 +1661,7 @@ func (x *TSelect_TFrom) String() string {
 func (*TSelect_TFrom) ProtoMessage() {}
 
 func (x *TSelect_TFrom) ProtoReflect() protoreflect.Message {
-	mi := &file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[17]
+	mi := &file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[18]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1564,7 +1690,7 @@ type TSelect_TWhere struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Strongly typed tree of predicates
-	FilterTyped *TFilter `protobuf:"bytes,1,opt,name=filter_typed,json=filterTyped,proto3" json:"filter_typed,omitempty"`
+	FilterTyped *TPredicate `protobuf:"bytes,1,opt,name=filter_typed,json=filterTyped,proto3" json:"filter_typed,omitempty"`
 	// An internal representation of YQL request part describing filters.
 	// Advanced connectors may use it for the full-fledged implementations of the push down.
 	FilterRaw *TAst `protobuf:"bytes,2,opt,name=filter_raw,json=filterRaw,proto3" json:"filter_raw,omitempty"`
@@ -1573,7 +1699,7 @@ type TSelect_TWhere struct {
 func (x *TSelect_TWhere) Reset() {
 	*x = TSelect_TWhere{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[18]
+		mi := &file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[19]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1586,7 +1712,7 @@ func (x *TSelect_TWhere) String() string {
 func (*TSelect_TWhere) ProtoMessage() {}
 
 func (x *TSelect_TWhere) ProtoReflect() protoreflect.Message {
-	mi := &file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[18]
+	mi := &file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[19]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1602,7 +1728,7 @@ func (*TSelect_TWhere) Descriptor() ([]byte, []int) {
 	return file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_rawDescGZIP(), []int{7, 2}
 }
 
-func (x *TSelect_TWhere) GetFilterTyped() *TFilter {
+func (x *TSelect_TWhere) GetFilterTyped() *TPredicate {
 	if x != nil {
 		return x.FilterTyped
 	}
@@ -1628,7 +1754,7 @@ type TSelect_TLimit struct {
 func (x *TSelect_TLimit) Reset() {
 	*x = TSelect_TLimit{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[19]
+		mi := &file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[20]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1641,7 +1767,7 @@ func (x *TSelect_TLimit) String() string {
 func (*TSelect_TLimit) ProtoMessage() {}
 
 func (x *TSelect_TLimit) ProtoReflect() protoreflect.Message {
-	mi := &file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[19]
+	mi := &file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[20]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1687,7 +1813,7 @@ type TSelect_TWhat_TItem struct {
 func (x *TSelect_TWhat_TItem) Reset() {
 	*x = TSelect_TWhat_TItem{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[20]
+		mi := &file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[21]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1700,7 +1826,7 @@ func (x *TSelect_TWhat_TItem) String() string {
 func (*TSelect_TWhat_TItem) ProtoMessage() {}
 
 func (x *TSelect_TWhat_TItem) ProtoReflect() protoreflect.Message {
-	mi := &file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[20]
+	mi := &file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[21]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1755,7 +1881,7 @@ type TReadSplitsResponse_TColumnSet struct {
 func (x *TReadSplitsResponse_TColumnSet) Reset() {
 	*x = TReadSplitsResponse_TColumnSet{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[21]
+		mi := &file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[22]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1768,7 +1894,7 @@ func (x *TReadSplitsResponse_TColumnSet) String() string {
 func (*TReadSplitsResponse_TColumnSet) ProtoMessage() {}
 
 func (x *TReadSplitsResponse_TColumnSet) ProtoReflect() protoreflect.Message {
-	mi := &file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[21]
+	mi := &file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[22]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1809,7 +1935,7 @@ type TReadSplitsResponse_TColumnSet_TColumn struct {
 func (x *TReadSplitsResponse_TColumnSet_TColumn) Reset() {
 	*x = TReadSplitsResponse_TColumnSet_TColumn{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[22]
+		mi := &file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[23]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1822,7 +1948,7 @@ func (x *TReadSplitsResponse_TColumnSet_TColumn) String() string {
 func (*TReadSplitsResponse_TColumnSet_TColumn) ProtoMessage() {}
 
 func (x *TReadSplitsResponse_TColumnSet_TColumn) ProtoReflect() protoreflect.Message {
-	mi := &file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[22]
+	mi := &file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[23]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1845,141 +1971,17 @@ func (x *TReadSplitsResponse_TColumnSet_TColumn) GetData() []*Ydb.Value {
 	return nil
 }
 
-// Represents an elementary comparison between a column and some value
-type TFilter_TComparison struct {
+// NOT
+type TPredicate_TNegation struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	// Types that are assignable to Payload:
-	//
-	//	*TFilter_TComparison_Binary
-	//	*TFilter_TComparison_IsNull
-	//	*TFilter_TComparison_IsNotNull
-	//	*TFilter_TComparison_In
-	//	*TFilter_TComparison_Between
-	Payload isTFilter_TComparison_Payload `protobuf_oneof:"payload"`
+	Operand *TPredicate `protobuf:"bytes,1,opt,name=operand,proto3" json:"operand,omitempty"`
 }
 
-func (x *TFilter_TComparison) Reset() {
-	*x = TFilter_TComparison{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[23]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *TFilter_TComparison) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*TFilter_TComparison) ProtoMessage() {}
-
-func (x *TFilter_TComparison) ProtoReflect() protoreflect.Message {
-	mi := &file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[23]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use TFilter_TComparison.ProtoReflect.Descriptor instead.
-func (*TFilter_TComparison) Descriptor() ([]byte, []int) {
-	return file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_rawDescGZIP(), []int{13, 0}
-}
-
-func (m *TFilter_TComparison) GetPayload() isTFilter_TComparison_Payload {
-	if m != nil {
-		return m.Payload
-	}
-	return nil
-}
-
-func (x *TFilter_TComparison) GetBinary() *TFilter_TComparison_TBinary {
-	if x, ok := x.GetPayload().(*TFilter_TComparison_Binary); ok {
-		return x.Binary
-	}
-	return nil
-}
-
-func (x *TFilter_TComparison) GetIsNull() *TFilter_TComparison_TIsNull {
-	if x, ok := x.GetPayload().(*TFilter_TComparison_IsNull); ok {
-		return x.IsNull
-	}
-	return nil
-}
-
-func (x *TFilter_TComparison) GetIsNotNull() *TFilter_TComparison_TIsNotNull {
-	if x, ok := x.GetPayload().(*TFilter_TComparison_IsNotNull); ok {
-		return x.IsNotNull
-	}
-	return nil
-}
-
-func (x *TFilter_TComparison) GetIn() *TFilter_TComparison_TIn {
-	if x, ok := x.GetPayload().(*TFilter_TComparison_In); ok {
-		return x.In
-	}
-	return nil
-}
-
-func (x *TFilter_TComparison) GetBetween() *TFilter_TComparison_TBetween {
-	if x, ok := x.GetPayload().(*TFilter_TComparison_Between); ok {
-		return x.Between
-	}
-	return nil
-}
-
-type isTFilter_TComparison_Payload interface {
-	isTFilter_TComparison_Payload()
-}
-
-type TFilter_TComparison_Binary struct {
-	Binary *TFilter_TComparison_TBinary `protobuf:"bytes,1,opt,name=binary,proto3,oneof"`
-}
-
-type TFilter_TComparison_IsNull struct {
-	IsNull *TFilter_TComparison_TIsNull `protobuf:"bytes,2,opt,name=is_null,json=isNull,proto3,oneof"`
-}
-
-type TFilter_TComparison_IsNotNull struct {
-	IsNotNull *TFilter_TComparison_TIsNotNull `protobuf:"bytes,3,opt,name=is_not_null,json=isNotNull,proto3,oneof"`
-}
-
-type TFilter_TComparison_In struct {
-	In *TFilter_TComparison_TIn `protobuf:"bytes,4,opt,name=in,proto3,oneof"`
-}
-
-type TFilter_TComparison_Between struct {
-	Between *TFilter_TComparison_TBetween `protobuf:"bytes,5,opt,name=between,proto3,oneof"`
-}
-
-func (*TFilter_TComparison_Binary) isTFilter_TComparison_Payload() {}
-
-func (*TFilter_TComparison_IsNull) isTFilter_TComparison_Payload() {}
-
-func (*TFilter_TComparison_IsNotNull) isTFilter_TComparison_Payload() {}
-
-func (*TFilter_TComparison_In) isTFilter_TComparison_Payload() {}
-
-func (*TFilter_TComparison_Between) isTFilter_TComparison_Payload() {}
-
-// transforms into "AND"
-type TFilter_TConjunction struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Operands []*TFilter `protobuf:"bytes,1,rep,name=operands,proto3" json:"operands,omitempty"`
-}
-
-func (x *TFilter_TConjunction) Reset() {
-	*x = TFilter_TConjunction{}
+func (x *TPredicate_TNegation) Reset() {
+	*x = TPredicate_TNegation{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[24]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -1987,13 +1989,13 @@ func (x *TFilter_TConjunction) Reset() {
 	}
 }
 
-func (x *TFilter_TConjunction) String() string {
+func (x *TPredicate_TNegation) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*TFilter_TConjunction) ProtoMessage() {}
+func (*TPredicate_TNegation) ProtoMessage() {}
 
-func (x *TFilter_TConjunction) ProtoReflect() protoreflect.Message {
+func (x *TPredicate_TNegation) ProtoReflect() protoreflect.Message {
 	mi := &file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[24]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -2005,29 +2007,29 @@ func (x *TFilter_TConjunction) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use TFilter_TConjunction.ProtoReflect.Descriptor instead.
-func (*TFilter_TConjunction) Descriptor() ([]byte, []int) {
-	return file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_rawDescGZIP(), []int{13, 1}
+// Deprecated: Use TPredicate_TNegation.ProtoReflect.Descriptor instead.
+func (*TPredicate_TNegation) Descriptor() ([]byte, []int) {
+	return file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_rawDescGZIP(), []int{14, 0}
 }
 
-func (x *TFilter_TConjunction) GetOperands() []*TFilter {
+func (x *TPredicate_TNegation) GetOperand() *TPredicate {
 	if x != nil {
-		return x.Operands
+		return x.Operand
 	}
 	return nil
 }
 
-// transforms into "OR"
-type TFilter_TDisjunction struct {
+// AND
+type TPredicate_TConjunction struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Operands []*TFilter `protobuf:"bytes,1,rep,name=operands,proto3" json:"operands,omitempty"`
+	Operands []*TPredicate `protobuf:"bytes,1,rep,name=operands,proto3" json:"operands,omitempty"`
 }
 
-func (x *TFilter_TDisjunction) Reset() {
-	*x = TFilter_TDisjunction{}
+func (x *TPredicate_TConjunction) Reset() {
+	*x = TPredicate_TConjunction{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[25]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -2035,13 +2037,13 @@ func (x *TFilter_TDisjunction) Reset() {
 	}
 }
 
-func (x *TFilter_TDisjunction) String() string {
+func (x *TPredicate_TConjunction) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*TFilter_TDisjunction) ProtoMessage() {}
+func (*TPredicate_TConjunction) ProtoMessage() {}
 
-func (x *TFilter_TDisjunction) ProtoReflect() protoreflect.Message {
+func (x *TPredicate_TConjunction) ProtoReflect() protoreflect.Message {
 	mi := &file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[25]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -2053,29 +2055,29 @@ func (x *TFilter_TDisjunction) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use TFilter_TDisjunction.ProtoReflect.Descriptor instead.
-func (*TFilter_TDisjunction) Descriptor() ([]byte, []int) {
-	return file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_rawDescGZIP(), []int{13, 2}
+// Deprecated: Use TPredicate_TConjunction.ProtoReflect.Descriptor instead.
+func (*TPredicate_TConjunction) Descriptor() ([]byte, []int) {
+	return file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_rawDescGZIP(), []int{14, 1}
 }
 
-func (x *TFilter_TDisjunction) GetOperands() []*TFilter {
+func (x *TPredicate_TConjunction) GetOperands() []*TPredicate {
 	if x != nil {
 		return x.Operands
 	}
 	return nil
 }
 
-// transforms into "NOT"
-type TFilter_TNegation struct {
+// OR
+type TPredicate_TDisjunction struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Operand *TFilter `protobuf:"bytes,1,opt,name=operand,proto3" json:"operand,omitempty"`
+	Operands []*TPredicate `protobuf:"bytes,1,rep,name=operands,proto3" json:"operands,omitempty"`
 }
 
-func (x *TFilter_TNegation) Reset() {
-	*x = TFilter_TNegation{}
+func (x *TPredicate_TDisjunction) Reset() {
+	*x = TPredicate_TDisjunction{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[26]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -2083,13 +2085,13 @@ func (x *TFilter_TNegation) Reset() {
 	}
 }
 
-func (x *TFilter_TNegation) String() string {
+func (x *TPredicate_TDisjunction) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*TFilter_TNegation) ProtoMessage() {}
+func (*TPredicate_TDisjunction) ProtoMessage() {}
 
-func (x *TFilter_TNegation) ProtoReflect() protoreflect.Message {
+func (x *TPredicate_TDisjunction) ProtoReflect() protoreflect.Message {
 	mi := &file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[26]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -2101,32 +2103,31 @@ func (x *TFilter_TNegation) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use TFilter_TNegation.ProtoReflect.Descriptor instead.
-func (*TFilter_TNegation) Descriptor() ([]byte, []int) {
-	return file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_rawDescGZIP(), []int{13, 3}
+// Deprecated: Use TPredicate_TDisjunction.ProtoReflect.Descriptor instead.
+func (*TPredicate_TDisjunction) Descriptor() ([]byte, []int) {
+	return file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_rawDescGZIP(), []int{14, 2}
 }
 
-func (x *TFilter_TNegation) GetOperand() *TFilter {
+func (x *TPredicate_TDisjunction) GetOperands() []*TPredicate {
 	if x != nil {
-		return x.Operand
+		return x.Operands
 	}
 	return nil
 }
 
-// SubExpr transformation rules:
-// 1. top-level:      $children
-// 2. other levels:  ($children)
-type TFilter_TSubExpr struct {
+// "$column BETWEEN $least AND $greatest"
+type TPredicate_TBetween struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	// Next level expression
-	Operand *TFilter `protobuf:"bytes,1,opt,name=operand,proto3" json:"operand,omitempty"`
+	Value    *TExpression `protobuf:"bytes,1,opt,name=value,proto3" json:"value,omitempty"`
+	Least    *TExpression `protobuf:"bytes,2,opt,name=least,proto3" json:"least,omitempty"`
+	Greatest *TExpression `protobuf:"bytes,3,opt,name=greatest,proto3" json:"greatest,omitempty"`
 }
 
-func (x *TFilter_TSubExpr) Reset() {
-	*x = TFilter_TSubExpr{}
+func (x *TPredicate_TBetween) Reset() {
+	*x = TPredicate_TBetween{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[27]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -2134,13 +2135,13 @@ func (x *TFilter_TSubExpr) Reset() {
 	}
 }
 
-func (x *TFilter_TSubExpr) String() string {
+func (x *TPredicate_TBetween) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*TFilter_TSubExpr) ProtoMessage() {}
+func (*TPredicate_TBetween) ProtoMessage() {}
 
-func (x *TFilter_TSubExpr) ProtoReflect() protoreflect.Message {
+func (x *TPredicate_TBetween) ProtoReflect() protoreflect.Message {
 	mi := &file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[27]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -2152,33 +2153,44 @@ func (x *TFilter_TSubExpr) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use TFilter_TSubExpr.ProtoReflect.Descriptor instead.
-func (*TFilter_TSubExpr) Descriptor() ([]byte, []int) {
-	return file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_rawDescGZIP(), []int{13, 4}
+// Deprecated: Use TPredicate_TBetween.ProtoReflect.Descriptor instead.
+func (*TPredicate_TBetween) Descriptor() ([]byte, []int) {
+	return file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_rawDescGZIP(), []int{14, 3}
 }
 
-func (x *TFilter_TSubExpr) GetOperand() *TFilter {
+func (x *TPredicate_TBetween) GetValue() *TExpression {
 	if x != nil {
-		return x.Operand
+		return x.Value
 	}
 	return nil
 }
 
-// A subset of comparators corresponding to the binary logical operators
-type TFilter_TComparison_TBinary struct {
+func (x *TPredicate_TBetween) GetLeast() *TExpression {
+	if x != nil {
+		return x.Least
+	}
+	return nil
+}
+
+func (x *TPredicate_TBetween) GetGreatest() *TExpression {
+	if x != nil {
+		return x.Greatest
+	}
+	return nil
+}
+
+// "$column IN $(set)"
+type TPredicate_TIn struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	// Types that are assignable to Payload:
-	//
-	//	*TFilter_TComparison_TBinary_TypedValue
-	//	*TFilter_TComparison_TBinary_Column
-	Payload isTFilter_TComparison_TBinary_Payload `protobuf_oneof:"payload"`
+	Value *TExpression   `protobuf:"bytes,1,opt,name=value,proto3" json:"value,omitempty"`
+	Set   []*TExpression `protobuf:"bytes,2,rep,name=set,proto3" json:"set,omitempty"`
 }
 
-func (x *TFilter_TComparison_TBinary) Reset() {
-	*x = TFilter_TComparison_TBinary{}
+func (x *TPredicate_TIn) Reset() {
+	*x = TPredicate_TIn{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[28]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -2186,13 +2198,13 @@ func (x *TFilter_TComparison_TBinary) Reset() {
 	}
 }
 
-func (x *TFilter_TComparison_TBinary) String() string {
+func (x *TPredicate_TIn) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*TFilter_TComparison_TBinary) ProtoMessage() {}
+func (*TPredicate_TIn) ProtoMessage() {}
 
-func (x *TFilter_TComparison_TBinary) ProtoReflect() protoreflect.Message {
+func (x *TPredicate_TIn) ProtoReflect() protoreflect.Message {
 	mi := &file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[28]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -2204,61 +2216,36 @@ func (x *TFilter_TComparison_TBinary) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use TFilter_TComparison_TBinary.ProtoReflect.Descriptor instead.
-func (*TFilter_TComparison_TBinary) Descriptor() ([]byte, []int) {
-	return file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_rawDescGZIP(), []int{13, 0, 0}
+// Deprecated: Use TPredicate_TIn.ProtoReflect.Descriptor instead.
+func (*TPredicate_TIn) Descriptor() ([]byte, []int) {
+	return file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_rawDescGZIP(), []int{14, 4}
 }
 
-func (m *TFilter_TComparison_TBinary) GetPayload() isTFilter_TComparison_TBinary_Payload {
-	if m != nil {
-		return m.Payload
+func (x *TPredicate_TIn) GetValue() *TExpression {
+	if x != nil {
+		return x.Value
 	}
 	return nil
 }
 
-func (x *TFilter_TComparison_TBinary) GetTypedValue() *Ydb.TypedValue {
-	if x, ok := x.GetPayload().(*TFilter_TComparison_TBinary_TypedValue); ok {
-		return x.TypedValue
+func (x *TPredicate_TIn) GetSet() []*TExpression {
+	if x != nil {
+		return x.Set
 	}
 	return nil
 }
 
-func (x *TFilter_TComparison_TBinary) GetColumn() string {
-	if x, ok := x.GetPayload().(*TFilter_TComparison_TBinary_Column); ok {
-		return x.Column
-	}
-	return ""
-}
-
-type isTFilter_TComparison_TBinary_Payload interface {
-	isTFilter_TComparison_TBinary_Payload()
-}
-
-type TFilter_TComparison_TBinary_TypedValue struct {
-	// A scalar value
-	TypedValue *Ydb.TypedValue `protobuf:"bytes,1,opt,name=typed_value,json=typedValue,proto3,oneof"`
-}
-
-type TFilter_TComparison_TBinary_Column struct {
-	// A name of another column to compare with
-	Column string `protobuf:"bytes,2,opt,name=column,proto3,oneof"`
-}
-
-func (*TFilter_TComparison_TBinary_TypedValue) isTFilter_TComparison_TBinary_Payload() {}
-
-func (*TFilter_TComparison_TBinary_Column) isTFilter_TComparison_TBinary_Payload() {}
-
-// Renders to "$column IS NULL"
-type TFilter_TComparison_TIsNull struct {
+// "$column IS NULL"
+type TPredicate_TIsNull struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Column string `protobuf:"bytes,1,opt,name=column,proto3" json:"column,omitempty"`
+	Value *TExpression `protobuf:"bytes,1,opt,name=value,proto3" json:"value,omitempty"`
 }
 
-func (x *TFilter_TComparison_TIsNull) Reset() {
-	*x = TFilter_TComparison_TIsNull{}
+func (x *TPredicate_TIsNull) Reset() {
+	*x = TPredicate_TIsNull{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[29]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -2266,13 +2253,13 @@ func (x *TFilter_TComparison_TIsNull) Reset() {
 	}
 }
 
-func (x *TFilter_TComparison_TIsNull) String() string {
+func (x *TPredicate_TIsNull) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*TFilter_TComparison_TIsNull) ProtoMessage() {}
+func (*TPredicate_TIsNull) ProtoMessage() {}
 
-func (x *TFilter_TComparison_TIsNull) ProtoReflect() protoreflect.Message {
+func (x *TPredicate_TIsNull) ProtoReflect() protoreflect.Message {
 	mi := &file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[29]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -2284,29 +2271,30 @@ func (x *TFilter_TComparison_TIsNull) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use TFilter_TComparison_TIsNull.ProtoReflect.Descriptor instead.
-func (*TFilter_TComparison_TIsNull) Descriptor() ([]byte, []int) {
-	return file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_rawDescGZIP(), []int{13, 0, 1}
+// Deprecated: Use TPredicate_TIsNull.ProtoReflect.Descriptor instead.
+func (*TPredicate_TIsNull) Descriptor() ([]byte, []int) {
+	return file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_rawDescGZIP(), []int{14, 5}
 }
 
-func (x *TFilter_TComparison_TIsNull) GetColumn() string {
+func (x *TPredicate_TIsNull) GetValue() *TExpression {
 	if x != nil {
-		return x.Column
+		return x.Value
 	}
-	return ""
+	return nil
 }
 
-// Renders to "$column IS NOT NULL"
-type TFilter_TComparison_TIsNotNull struct {
+// "$column IS NOT NULL"
+// TODO: maybe it is better to express with TNegation here
+type TPredicate_TIsNotNull struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Column string `protobuf:"bytes,1,opt,name=column,proto3" json:"column,omitempty"`
+	Value *TExpression `protobuf:"bytes,1,opt,name=value,proto3" json:"value,omitempty"`
 }
 
-func (x *TFilter_TComparison_TIsNotNull) Reset() {
-	*x = TFilter_TComparison_TIsNotNull{}
+func (x *TPredicate_TIsNotNull) Reset() {
+	*x = TPredicate_TIsNotNull{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[30]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -2314,13 +2302,13 @@ func (x *TFilter_TComparison_TIsNotNull) Reset() {
 	}
 }
 
-func (x *TFilter_TComparison_TIsNotNull) String() string {
+func (x *TPredicate_TIsNotNull) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*TFilter_TComparison_TIsNotNull) ProtoMessage() {}
+func (*TPredicate_TIsNotNull) ProtoMessage() {}
 
-func (x *TFilter_TComparison_TIsNotNull) ProtoReflect() protoreflect.Message {
+func (x *TPredicate_TIsNotNull) ProtoReflect() protoreflect.Message {
 	mi := &file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[30]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -2332,29 +2320,31 @@ func (x *TFilter_TComparison_TIsNotNull) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use TFilter_TComparison_TIsNotNull.ProtoReflect.Descriptor instead.
-func (*TFilter_TComparison_TIsNotNull) Descriptor() ([]byte, []int) {
-	return file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_rawDescGZIP(), []int{13, 0, 2}
+// Deprecated: Use TPredicate_TIsNotNull.ProtoReflect.Descriptor instead.
+func (*TPredicate_TIsNotNull) Descriptor() ([]byte, []int) {
+	return file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_rawDescGZIP(), []int{14, 6}
 }
 
-func (x *TFilter_TComparison_TIsNotNull) GetColumn() string {
+func (x *TPredicate_TIsNotNull) GetValue() *TExpression {
 	if x != nil {
-		return x.Column
+		return x.Value
 	}
-	return ""
+	return nil
 }
 
-// Renders to "$column IN $(values)"
-type TFilter_TComparison_TIn struct {
+// A subset of comparators corresponding to the binary logical operators
+type TPredicate_TComparison struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Values []*Ydb.TypedValue `protobuf:"bytes,1,rep,name=values,proto3" json:"values,omitempty"`
+	Operation  TPredicate_TComparison_EOperation `protobuf:"varint,1,opt,name=operation,proto3,enum=NYql.NConnector.NApi.TPredicate_TComparison_EOperation" json:"operation,omitempty"`
+	LeftValue  *TExpression                      `protobuf:"bytes,2,opt,name=left_value,json=leftValue,proto3" json:"left_value,omitempty"`
+	RightValue *TExpression                      `protobuf:"bytes,3,opt,name=right_value,json=rightValue,proto3" json:"right_value,omitempty"`
 }
 
-func (x *TFilter_TComparison_TIn) Reset() {
-	*x = TFilter_TComparison_TIn{}
+func (x *TPredicate_TComparison) Reset() {
+	*x = TPredicate_TComparison{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[31]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -2362,13 +2352,13 @@ func (x *TFilter_TComparison_TIn) Reset() {
 	}
 }
 
-func (x *TFilter_TComparison_TIn) String() string {
+func (x *TPredicate_TComparison) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*TFilter_TComparison_TIn) ProtoMessage() {}
+func (*TPredicate_TComparison) ProtoMessage() {}
 
-func (x *TFilter_TComparison_TIn) ProtoReflect() protoreflect.Message {
+func (x *TPredicate_TComparison) ProtoReflect() protoreflect.Message {
 	mi := &file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[31]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -2380,70 +2370,28 @@ func (x *TFilter_TComparison_TIn) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use TFilter_TComparison_TIn.ProtoReflect.Descriptor instead.
-func (*TFilter_TComparison_TIn) Descriptor() ([]byte, []int) {
-	return file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_rawDescGZIP(), []int{13, 0, 3}
+// Deprecated: Use TPredicate_TComparison.ProtoReflect.Descriptor instead.
+func (*TPredicate_TComparison) Descriptor() ([]byte, []int) {
+	return file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_rawDescGZIP(), []int{14, 7}
 }
 
-func (x *TFilter_TComparison_TIn) GetValues() []*Ydb.TypedValue {
+func (x *TPredicate_TComparison) GetOperation() TPredicate_TComparison_EOperation {
 	if x != nil {
-		return x.Values
+		return x.Operation
 	}
-	return nil
+	return TPredicate_TComparison_RESERVED
 }
 
-// Renders to "$column BETWEEN $least AND $greatest"
-type TFilter_TComparison_TBetween struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Least    *Ydb.TypedValue `protobuf:"bytes,1,opt,name=least,proto3" json:"least,omitempty"`
-	Greatest *Ydb.TypedValue `protobuf:"bytes,2,opt,name=greatest,proto3" json:"greatest,omitempty"`
-}
-
-func (x *TFilter_TComparison_TBetween) Reset() {
-	*x = TFilter_TComparison_TBetween{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[32]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *TFilter_TComparison_TBetween) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*TFilter_TComparison_TBetween) ProtoMessage() {}
-
-func (x *TFilter_TComparison_TBetween) ProtoReflect() protoreflect.Message {
-	mi := &file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[32]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use TFilter_TComparison_TBetween.ProtoReflect.Descriptor instead.
-func (*TFilter_TComparison_TBetween) Descriptor() ([]byte, []int) {
-	return file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_rawDescGZIP(), []int{13, 0, 4}
-}
-
-func (x *TFilter_TComparison_TBetween) GetLeast() *Ydb.TypedValue {
+func (x *TPredicate_TComparison) GetLeftValue() *TExpression {
 	if x != nil {
-		return x.Least
+		return x.LeftValue
 	}
 	return nil
 }
 
-func (x *TFilter_TComparison_TBetween) GetGreatest() *Ydb.TypedValue {
+func (x *TPredicate_TComparison) GetRightValue() *TExpression {
 	if x != nil {
-		return x.Greatest
+		return x.RightValue
 	}
 	return nil
 }
@@ -2459,7 +2407,7 @@ type TAst_TList struct {
 func (x *TAst_TList) Reset() {
 	*x = TAst_TList{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[33]
+		mi := &file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[32]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2472,7 +2420,7 @@ func (x *TAst_TList) String() string {
 func (*TAst_TList) ProtoMessage() {}
 
 func (x *TAst_TList) ProtoReflect() protoreflect.Message {
-	mi := &file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[33]
+	mi := &file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[32]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2485,7 +2433,7 @@ func (x *TAst_TList) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use TAst_TList.ProtoReflect.Descriptor instead.
 func (*TAst_TList) Descriptor() ([]byte, []int) {
-	return file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_rawDescGZIP(), []int{15, 0}
+	return file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_rawDescGZIP(), []int{16, 0}
 }
 
 func (x *TAst_TList) GetChildren() []*TAst {
@@ -2574,7 +2522,7 @@ var file_ydb_library_yql_providers_generic_connector_api_service_protos_connecto
 	0x73, 0x12, 0x32, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x64, 0x20, 0x01, 0x28, 0x0b,
 	0x32, 0x1c, 0x2e, 0x4e, 0x59, 0x71, 0x6c, 0x2e, 0x4e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74,
 	0x6f, 0x72, 0x2e, 0x4e, 0x41, 0x70, 0x69, 0x2e, 0x54, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x05,
-	0x65, 0x72, 0x72, 0x6f, 0x72, 0x22, 0xb5, 0x05, 0x0a, 0x07, 0x54, 0x53, 0x65, 0x6c, 0x65, 0x63,
+	0x65, 0x72, 0x72, 0x6f, 0x72, 0x22, 0xb8, 0x05, 0x0a, 0x07, 0x54, 0x53, 0x65, 0x6c, 0x65, 0x63,
 	0x74, 0x12, 0x5b, 0x0a, 0x14, 0x64, 0x61, 0x74, 0x61, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65,
 	0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
 	0x29, 0x2e, 0x4e, 0x59, 0x71, 0x6c, 0x2e, 0x4e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f,
@@ -2605,220 +2553,233 @@ var file_ydb_library_yql_providers_generic_connector_api_service_protos_connecto
 	0x64, 0x62, 0x2e, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x48, 0x00, 0x52, 0x06, 0x63, 0x6f, 0x6c,
 	0x75, 0x6d, 0x6e, 0x42, 0x09, 0x0a, 0x07, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x1a, 0x1d,
 	0x0a, 0x05, 0x54, 0x46, 0x72, 0x6f, 0x6d, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x61, 0x62, 0x6c, 0x65,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x1a, 0x85, 0x01,
-	0x0a, 0x06, 0x54, 0x57, 0x68, 0x65, 0x72, 0x65, 0x12, 0x40, 0x0a, 0x0c, 0x66, 0x69, 0x6c, 0x74,
-	0x65, 0x72, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x1a, 0x88, 0x01,
+	0x0a, 0x06, 0x54, 0x57, 0x68, 0x65, 0x72, 0x65, 0x12, 0x43, 0x0a, 0x0c, 0x66, 0x69, 0x6c, 0x74,
+	0x65, 0x72, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20,
 	0x2e, 0x4e, 0x59, 0x71, 0x6c, 0x2e, 0x4e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72,
-	0x2e, 0x4e, 0x41, 0x70, 0x69, 0x2e, 0x54, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x52, 0x0b, 0x66,
-	0x69, 0x6c, 0x74, 0x65, 0x72, 0x54, 0x79, 0x70, 0x65, 0x64, 0x12, 0x39, 0x0a, 0x0a, 0x66, 0x69,
-	0x6c, 0x74, 0x65, 0x72, 0x5f, 0x72, 0x61, 0x77, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a,
+	0x2e, 0x4e, 0x41, 0x70, 0x69, 0x2e, 0x54, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65,
+	0x52, 0x0b, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x54, 0x79, 0x70, 0x65, 0x64, 0x12, 0x39, 0x0a,
+	0x0a, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x5f, 0x72, 0x61, 0x77, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x1a, 0x2e, 0x4e, 0x59, 0x71, 0x6c, 0x2e, 0x4e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63,
+	0x74, 0x6f, 0x72, 0x2e, 0x4e, 0x41, 0x70, 0x69, 0x2e, 0x54, 0x41, 0x73, 0x74, 0x52, 0x09, 0x66,
+	0x69, 0x6c, 0x74, 0x65, 0x72, 0x52, 0x61, 0x77, 0x1a, 0x36, 0x0a, 0x06, 0x54, 0x4c, 0x69, 0x6d,
+	0x69, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x04, 0x52, 0x05, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x6f, 0x66, 0x66, 0x73,
+	0x65, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, 0x06, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74,
+	0x22, 0x6e, 0x0a, 0x06, 0x54, 0x53, 0x70, 0x6c, 0x69, 0x74, 0x12, 0x35, 0x0a, 0x06, 0x73, 0x65,
+	0x6c, 0x65, 0x63, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x4e, 0x59, 0x71,
+	0x6c, 0x2e, 0x4e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x2e, 0x4e, 0x41, 0x70,
+	0x69, 0x2e, 0x54, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x52, 0x06, 0x73, 0x65, 0x6c, 0x65, 0x63,
+	0x74, 0x12, 0x22, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x48, 0x00, 0x52, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69,
+	0x70, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x09, 0x0a, 0x07, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64,
+	0x22, 0xb8, 0x04, 0x0a, 0x12, 0x54, 0x52, 0x65, 0x61, 0x64, 0x53, 0x70, 0x6c, 0x69, 0x74, 0x73,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x5b, 0x0a, 0x14, 0x64, 0x61, 0x74, 0x61, 0x5f,
+	0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x4e, 0x59, 0x71, 0x6c, 0x2e, 0x4e, 0x43, 0x6f,
+	0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x2e, 0x4e, 0x41, 0x70, 0x69, 0x2e, 0x54, 0x44, 0x61,
+	0x74, 0x61, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65,
+	0x52, 0x12, 0x64, 0x61, 0x74, 0x61, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x49, 0x6e, 0x73, 0x74,
+	0x61, 0x6e, 0x63, 0x65, 0x12, 0x34, 0x0a, 0x06, 0x73, 0x70, 0x6c, 0x69, 0x74, 0x73, 0x18, 0x02,
+	0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x4e, 0x59, 0x71, 0x6c, 0x2e, 0x4e, 0x43, 0x6f, 0x6e,
+	0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x2e, 0x4e, 0x41, 0x70, 0x69, 0x2e, 0x54, 0x53, 0x70, 0x6c,
+	0x69, 0x74, 0x52, 0x06, 0x73, 0x70, 0x6c, 0x69, 0x74, 0x73, 0x12, 0x42, 0x0a, 0x04, 0x6d, 0x6f,
+	0x64, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2e, 0x2e, 0x4e, 0x59, 0x71, 0x6c, 0x2e,
+	0x4e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x2e, 0x4e, 0x41, 0x70, 0x69, 0x2e,
+	0x54, 0x52, 0x65, 0x61, 0x64, 0x53, 0x70, 0x6c, 0x69, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x2e, 0x45, 0x4d, 0x6f, 0x64, 0x65, 0x52, 0x04, 0x6d, 0x6f, 0x64, 0x65, 0x12, 0x48,
+	0x0a, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x30,
 	0x2e, 0x4e, 0x59, 0x71, 0x6c, 0x2e, 0x4e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72,
-	0x2e, 0x4e, 0x41, 0x70, 0x69, 0x2e, 0x54, 0x41, 0x73, 0x74, 0x52, 0x09, 0x66, 0x69, 0x6c, 0x74,
-	0x65, 0x72, 0x52, 0x61, 0x77, 0x1a, 0x36, 0x0a, 0x06, 0x54, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x12,
-	0x14, 0x0a, 0x05, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x05,
-	0x6c, 0x69, 0x6d, 0x69, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x04, 0x52, 0x06, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x22, 0x6e, 0x0a,
-	0x06, 0x54, 0x53, 0x70, 0x6c, 0x69, 0x74, 0x12, 0x35, 0x0a, 0x06, 0x73, 0x65, 0x6c, 0x65, 0x63,
-	0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x4e, 0x59, 0x71, 0x6c, 0x2e, 0x4e,
+	0x2e, 0x4e, 0x41, 0x70, 0x69, 0x2e, 0x54, 0x52, 0x65, 0x61, 0x64, 0x53, 0x70, 0x6c, 0x69, 0x74,
+	0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x45, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74,
+	0x52, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x12, 0x41, 0x0a, 0x0a, 0x70, 0x61, 0x67, 0x69,
+	0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x4e,
+	0x59, 0x71, 0x6c, 0x2e, 0x4e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x2e, 0x4e,
+	0x41, 0x70, 0x69, 0x2e, 0x54, 0x50, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52,
+	0x0a, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x47, 0x0a, 0x0c, 0x63,
+	0x6f, 0x6e, 0x74, 0x69, 0x6e, 0x75, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x06, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x23, 0x2e, 0x4e, 0x59, 0x71, 0x6c, 0x2e, 0x4e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63,
+	0x74, 0x6f, 0x72, 0x2e, 0x4e, 0x41, 0x70, 0x69, 0x2e, 0x54, 0x43, 0x6f, 0x6e, 0x74, 0x69, 0x6e,
+	0x75, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0c, 0x63, 0x6f, 0x6e, 0x74, 0x69, 0x6e, 0x75, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x22, 0x36, 0x0a, 0x05, 0x45, 0x4d, 0x6f, 0x64, 0x65, 0x12, 0x11, 0x0a,
+	0x0d, 0x4d, 0x4f, 0x44, 0x45, 0x5f, 0x52, 0x45, 0x53, 0x45, 0x52, 0x56, 0x45, 0x44, 0x10, 0x00,
+	0x12, 0x0b, 0x0a, 0x07, 0x4f, 0x52, 0x44, 0x45, 0x52, 0x45, 0x44, 0x10, 0x01, 0x12, 0x0d, 0x0a,
+	0x09, 0x55, 0x4e, 0x4f, 0x52, 0x44, 0x45, 0x52, 0x45, 0x44, 0x10, 0x02, 0x22, 0x3d, 0x0a, 0x07,
+	0x45, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x12, 0x13, 0x0a, 0x0f, 0x46, 0x4f, 0x52, 0x4d, 0x41,
+	0x54, 0x5f, 0x52, 0x45, 0x53, 0x45, 0x52, 0x56, 0x45, 0x44, 0x10, 0x00, 0x12, 0x17, 0x0a, 0x13,
+	0x41, 0x52, 0x52, 0x4f, 0x57, 0x5f, 0x49, 0x50, 0x43, 0x5f, 0x53, 0x54, 0x52, 0x45, 0x41, 0x4d,
+	0x49, 0x4e, 0x47, 0x10, 0x02, 0x22, 0x04, 0x08, 0x01, 0x10, 0x01, 0x22, 0x81, 0x04, 0x0a, 0x13,
+	0x54, 0x52, 0x65, 0x61, 0x64, 0x53, 0x70, 0x6c, 0x69, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f,
+	0x6e, 0x73, 0x65, 0x12, 0x55, 0x0a, 0x0a, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x5f, 0x73, 0x65,
+	0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x34, 0x2e, 0x4e, 0x59, 0x71, 0x6c, 0x2e, 0x4e,
 	0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x2e, 0x4e, 0x41, 0x70, 0x69, 0x2e, 0x54,
-	0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x52, 0x06, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x12, 0x22,
-	0x0a, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x0c, 0x48, 0x00, 0x52, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69,
-	0x6f, 0x6e, 0x42, 0x09, 0x0a, 0x07, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x22, 0xb8, 0x04,
-	0x0a, 0x12, 0x54, 0x52, 0x65, 0x61, 0x64, 0x53, 0x70, 0x6c, 0x69, 0x74, 0x73, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x12, 0x5b, 0x0a, 0x14, 0x64, 0x61, 0x74, 0x61, 0x5f, 0x73, 0x6f, 0x75,
-	0x72, 0x63, 0x65, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x29, 0x2e, 0x4e, 0x59, 0x71, 0x6c, 0x2e, 0x4e, 0x43, 0x6f, 0x6e, 0x6e, 0x65,
-	0x63, 0x74, 0x6f, 0x72, 0x2e, 0x4e, 0x41, 0x70, 0x69, 0x2e, 0x54, 0x44, 0x61, 0x74, 0x61, 0x53,
-	0x6f, 0x75, 0x72, 0x63, 0x65, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x52, 0x12, 0x64,
-	0x61, 0x74, 0x61, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63,
-	0x65, 0x12, 0x34, 0x0a, 0x06, 0x73, 0x70, 0x6c, 0x69, 0x74, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28,
-	0x0b, 0x32, 0x1c, 0x2e, 0x4e, 0x59, 0x71, 0x6c, 0x2e, 0x4e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63,
-	0x74, 0x6f, 0x72, 0x2e, 0x4e, 0x41, 0x70, 0x69, 0x2e, 0x54, 0x53, 0x70, 0x6c, 0x69, 0x74, 0x52,
-	0x06, 0x73, 0x70, 0x6c, 0x69, 0x74, 0x73, 0x12, 0x42, 0x0a, 0x04, 0x6d, 0x6f, 0x64, 0x65, 0x18,
-	0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2e, 0x2e, 0x4e, 0x59, 0x71, 0x6c, 0x2e, 0x4e, 0x43, 0x6f,
+	0x52, 0x65, 0x61, 0x64, 0x53, 0x70, 0x6c, 0x69, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
+	0x73, 0x65, 0x2e, 0x54, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x53, 0x65, 0x74, 0x48, 0x00, 0x52,
+	0x09, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x53, 0x65, 0x74, 0x12, 0x30, 0x0a, 0x13, 0x61, 0x72,
+	0x72, 0x6f, 0x77, 0x5f, 0x69, 0x70, 0x63, 0x5f, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x69, 0x6e,
+	0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x48, 0x00, 0x52, 0x11, 0x61, 0x72, 0x72, 0x6f, 0x77,
+	0x49, 0x70, 0x63, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x69, 0x6e, 0x67, 0x12, 0x2c, 0x0a, 0x12,
+	0x73, 0x70, 0x6c, 0x69, 0x74, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x5f, 0x6e, 0x75, 0x6d, 0x62,
+	0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x10, 0x73, 0x70, 0x6c, 0x69, 0x74, 0x49,
+	0x6e, 0x64, 0x65, 0x78, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x47, 0x0a, 0x0c, 0x63, 0x6f,
+	0x6e, 0x74, 0x69, 0x6e, 0x75, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x23, 0x2e, 0x4e, 0x59, 0x71, 0x6c, 0x2e, 0x4e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74,
+	0x6f, 0x72, 0x2e, 0x4e, 0x41, 0x70, 0x69, 0x2e, 0x54, 0x43, 0x6f, 0x6e, 0x74, 0x69, 0x6e, 0x75,
+	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0c, 0x63, 0x6f, 0x6e, 0x74, 0x69, 0x6e, 0x75, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x12, 0x32, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x64, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x4e, 0x59, 0x71, 0x6c, 0x2e, 0x4e, 0x43, 0x6f, 0x6e, 0x6e, 0x65,
+	0x63, 0x74, 0x6f, 0x72, 0x2e, 0x4e, 0x41, 0x70, 0x69, 0x2e, 0x54, 0x45, 0x72, 0x72, 0x6f, 0x72,
+	0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x1a, 0xaa, 0x01, 0x0a, 0x0a, 0x54, 0x43, 0x6f, 0x6c,
+	0x75, 0x6d, 0x6e, 0x53, 0x65, 0x74, 0x12, 0x1f, 0x0a, 0x04, 0x6d, 0x65, 0x74, 0x61, 0x18, 0x01,
+	0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x59, 0x64, 0x62, 0x2e, 0x43, 0x6f, 0x6c, 0x75, 0x6d,
+	0x6e, 0x52, 0x04, 0x6d, 0x65, 0x74, 0x61, 0x12, 0x50, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18,
+	0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x3c, 0x2e, 0x4e, 0x59, 0x71, 0x6c, 0x2e, 0x4e, 0x43, 0x6f,
 	0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x2e, 0x4e, 0x41, 0x70, 0x69, 0x2e, 0x54, 0x52, 0x65,
-	0x61, 0x64, 0x53, 0x70, 0x6c, 0x69, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e,
-	0x45, 0x4d, 0x6f, 0x64, 0x65, 0x52, 0x04, 0x6d, 0x6f, 0x64, 0x65, 0x12, 0x48, 0x0a, 0x06, 0x66,
-	0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x30, 0x2e, 0x4e, 0x59,
-	0x71, 0x6c, 0x2e, 0x4e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x2e, 0x4e, 0x41,
-	0x70, 0x69, 0x2e, 0x54, 0x52, 0x65, 0x61, 0x64, 0x53, 0x70, 0x6c, 0x69, 0x74, 0x73, 0x52, 0x65,
-	0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x45, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x52, 0x06, 0x66,
-	0x6f, 0x72, 0x6d, 0x61, 0x74, 0x12, 0x41, 0x0a, 0x0a, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x4e, 0x59, 0x71, 0x6c,
-	0x2e, 0x4e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x2e, 0x4e, 0x41, 0x70, 0x69,
-	0x2e, 0x54, 0x50, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0a, 0x70, 0x61,
-	0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x47, 0x0a, 0x0c, 0x63, 0x6f, 0x6e, 0x74,
-	0x69, 0x6e, 0x75, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23,
-	0x2e, 0x4e, 0x59, 0x71, 0x6c, 0x2e, 0x4e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72,
-	0x2e, 0x4e, 0x41, 0x70, 0x69, 0x2e, 0x54, 0x43, 0x6f, 0x6e, 0x74, 0x69, 0x6e, 0x75, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x52, 0x0c, 0x63, 0x6f, 0x6e, 0x74, 0x69, 0x6e, 0x75, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x22, 0x36, 0x0a, 0x05, 0x45, 0x4d, 0x6f, 0x64, 0x65, 0x12, 0x11, 0x0a, 0x0d, 0x4d, 0x4f,
-	0x44, 0x45, 0x5f, 0x52, 0x45, 0x53, 0x45, 0x52, 0x56, 0x45, 0x44, 0x10, 0x00, 0x12, 0x0b, 0x0a,
-	0x07, 0x4f, 0x52, 0x44, 0x45, 0x52, 0x45, 0x44, 0x10, 0x01, 0x12, 0x0d, 0x0a, 0x09, 0x55, 0x4e,
-	0x4f, 0x52, 0x44, 0x45, 0x52, 0x45, 0x44, 0x10, 0x02, 0x22, 0x3d, 0x0a, 0x07, 0x45, 0x46, 0x6f,
-	0x72, 0x6d, 0x61, 0x74, 0x12, 0x13, 0x0a, 0x0f, 0x46, 0x4f, 0x52, 0x4d, 0x41, 0x54, 0x5f, 0x52,
-	0x45, 0x53, 0x45, 0x52, 0x56, 0x45, 0x44, 0x10, 0x00, 0x12, 0x17, 0x0a, 0x13, 0x41, 0x52, 0x52,
-	0x4f, 0x57, 0x5f, 0x49, 0x50, 0x43, 0x5f, 0x53, 0x54, 0x52, 0x45, 0x41, 0x4d, 0x49, 0x4e, 0x47,
-	0x10, 0x02, 0x22, 0x04, 0x08, 0x01, 0x10, 0x01, 0x22, 0x81, 0x04, 0x0a, 0x13, 0x54, 0x52, 0x65,
 	0x61, 0x64, 0x53, 0x70, 0x6c, 0x69, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x12, 0x55, 0x0a, 0x0a, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x5f, 0x73, 0x65, 0x74, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x34, 0x2e, 0x4e, 0x59, 0x71, 0x6c, 0x2e, 0x4e, 0x43, 0x6f, 0x6e,
-	0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x2e, 0x4e, 0x41, 0x70, 0x69, 0x2e, 0x54, 0x52, 0x65, 0x61,
-	0x64, 0x53, 0x70, 0x6c, 0x69, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e,
-	0x54, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x53, 0x65, 0x74, 0x48, 0x00, 0x52, 0x09, 0x63, 0x6f,
-	0x6c, 0x75, 0x6d, 0x6e, 0x53, 0x65, 0x74, 0x12, 0x30, 0x0a, 0x13, 0x61, 0x72, 0x72, 0x6f, 0x77,
-	0x5f, 0x69, 0x70, 0x63, 0x5f, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x69, 0x6e, 0x67, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x0c, 0x48, 0x00, 0x52, 0x11, 0x61, 0x72, 0x72, 0x6f, 0x77, 0x49, 0x70, 0x63,
-	0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x69, 0x6e, 0x67, 0x12, 0x2c, 0x0a, 0x12, 0x73, 0x70, 0x6c,
-	0x69, 0x74, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x5f, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18,
-	0x03, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x10, 0x73, 0x70, 0x6c, 0x69, 0x74, 0x49, 0x6e, 0x64, 0x65,
-	0x78, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x47, 0x0a, 0x0c, 0x63, 0x6f, 0x6e, 0x74, 0x69,
-	0x6e, 0x75, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e,
+	0x2e, 0x54, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x53, 0x65, 0x74, 0x2e, 0x54, 0x43, 0x6f, 0x6c,
+	0x75, 0x6d, 0x6e, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x1a, 0x29, 0x0a, 0x07, 0x54, 0x43, 0x6f,
+	0x6c, 0x75, 0x6d, 0x6e, 0x12, 0x1e, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x03,
+	0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x59, 0x64, 0x62, 0x2e, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x04,
+	0x64, 0x61, 0x74, 0x61, 0x42, 0x09, 0x0a, 0x07, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x22,
+	0x37, 0x0a, 0x0b, 0x54, 0x50, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x12,
+	0x0a, 0x04, 0x72, 0x6f, 0x77, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x04, 0x72, 0x6f,
+	0x77, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x79, 0x74, 0x65, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x04, 0x52, 0x05, 0x62, 0x79, 0x74, 0x65, 0x73, 0x22, 0x3e, 0x0a, 0x0d, 0x54, 0x43, 0x6f, 0x6e,
+	0x74, 0x69, 0x6e, 0x75, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x22, 0x0a, 0x0b, 0x64, 0x65, 0x73,
+	0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x48, 0x00,
+	0x52, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x09, 0x0a,
+	0x07, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x22, 0x66, 0x0a, 0x0b, 0x54, 0x45, 0x78, 0x70,
+	0x72, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x32, 0x0a, 0x0b, 0x74, 0x79, 0x70, 0x65, 0x64,
+	0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x59,
+	0x64, 0x62, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x64, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x48, 0x00, 0x52,
+	0x0a, 0x74, 0x79, 0x70, 0x65, 0x64, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x18, 0x0a, 0x06, 0x63,
+	0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x06, 0x63,
+	0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x42, 0x09, 0x0a, 0x07, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64,
+	0x22, 0xc4, 0x0c, 0x0a, 0x0a, 0x54, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x12,
+	0x48, 0x0a, 0x08, 0x6e, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x2a, 0x2e, 0x4e, 0x59, 0x71, 0x6c, 0x2e, 0x4e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63,
+	0x74, 0x6f, 0x72, 0x2e, 0x4e, 0x41, 0x70, 0x69, 0x2e, 0x54, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63,
+	0x61, 0x74, 0x65, 0x2e, 0x54, 0x4e, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x48, 0x00, 0x52,
+	0x08, 0x6e, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x51, 0x0a, 0x0b, 0x63, 0x6f, 0x6e,
+	0x6a, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2d,
+	0x2e, 0x4e, 0x59, 0x71, 0x6c, 0x2e, 0x4e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72,
+	0x2e, 0x4e, 0x41, 0x70, 0x69, 0x2e, 0x54, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65,
+	0x2e, 0x54, 0x43, 0x6f, 0x6e, 0x6a, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x48, 0x00, 0x52,
+	0x0b, 0x63, 0x6f, 0x6e, 0x6a, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x51, 0x0a, 0x0b,
+	0x64, 0x69, 0x73, 0x6a, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x2d, 0x2e, 0x4e, 0x59, 0x71, 0x6c, 0x2e, 0x4e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63,
+	0x74, 0x6f, 0x72, 0x2e, 0x4e, 0x41, 0x70, 0x69, 0x2e, 0x54, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63,
+	0x61, 0x74, 0x65, 0x2e, 0x54, 0x44, 0x69, 0x73, 0x6a, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e,
+	0x48, 0x00, 0x52, 0x0b, 0x64, 0x69, 0x73, 0x6a, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12,
+	0x45, 0x0a, 0x07, 0x62, 0x65, 0x74, 0x77, 0x65, 0x65, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x29, 0x2e, 0x4e, 0x59, 0x71, 0x6c, 0x2e, 0x4e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74,
+	0x6f, 0x72, 0x2e, 0x4e, 0x41, 0x70, 0x69, 0x2e, 0x54, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61,
+	0x74, 0x65, 0x2e, 0x54, 0x42, 0x65, 0x74, 0x77, 0x65, 0x65, 0x6e, 0x48, 0x00, 0x52, 0x07, 0x62,
+	0x65, 0x74, 0x77, 0x65, 0x65, 0x6e, 0x12, 0x36, 0x0a, 0x02, 0x69, 0x6e, 0x18, 0x05, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x24, 0x2e, 0x4e, 0x59, 0x71, 0x6c, 0x2e, 0x4e, 0x43, 0x6f, 0x6e, 0x6e, 0x65,
+	0x63, 0x74, 0x6f, 0x72, 0x2e, 0x4e, 0x41, 0x70, 0x69, 0x2e, 0x54, 0x50, 0x72, 0x65, 0x64, 0x69,
+	0x63, 0x61, 0x74, 0x65, 0x2e, 0x54, 0x49, 0x6e, 0x48, 0x00, 0x52, 0x02, 0x69, 0x6e, 0x12, 0x43,
+	0x0a, 0x07, 0x69, 0x73, 0x5f, 0x6e, 0x75, 0x6c, 0x6c, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x28, 0x2e, 0x4e, 0x59, 0x71, 0x6c, 0x2e, 0x4e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f,
+	0x72, 0x2e, 0x4e, 0x41, 0x70, 0x69, 0x2e, 0x54, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74,
+	0x65, 0x2e, 0x54, 0x49, 0x73, 0x4e, 0x75, 0x6c, 0x6c, 0x48, 0x00, 0x52, 0x06, 0x69, 0x73, 0x4e,
+	0x75, 0x6c, 0x6c, 0x12, 0x4d, 0x0a, 0x0b, 0x69, 0x73, 0x5f, 0x6e, 0x6f, 0x74, 0x5f, 0x6e, 0x75,
+	0x6c, 0x6c, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2b, 0x2e, 0x4e, 0x59, 0x71, 0x6c, 0x2e,
+	0x4e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x2e, 0x4e, 0x41, 0x70, 0x69, 0x2e,
+	0x54, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x2e, 0x54, 0x49, 0x73, 0x4e, 0x6f,
+	0x74, 0x4e, 0x75, 0x6c, 0x6c, 0x48, 0x00, 0x52, 0x09, 0x69, 0x73, 0x4e, 0x6f, 0x74, 0x4e, 0x75,
+	0x6c, 0x6c, 0x12, 0x4e, 0x0a, 0x0a, 0x63, 0x6f, 0x6d, 0x70, 0x61, 0x72, 0x69, 0x73, 0x6f, 0x6e,
+	0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2c, 0x2e, 0x4e, 0x59, 0x71, 0x6c, 0x2e, 0x4e, 0x43,
+	0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x2e, 0x4e, 0x41, 0x70, 0x69, 0x2e, 0x54, 0x50,
+	0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x2e, 0x54, 0x43, 0x6f, 0x6d, 0x70, 0x61, 0x72,
+	0x69, 0x73, 0x6f, 0x6e, 0x48, 0x00, 0x52, 0x0a, 0x63, 0x6f, 0x6d, 0x70, 0x61, 0x72, 0x69, 0x73,
+	0x6f, 0x6e, 0x1a, 0x47, 0x0a, 0x09, 0x54, 0x4e, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12,
+	0x3a, 0x0a, 0x07, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x6e, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x20, 0x2e, 0x4e, 0x59, 0x71, 0x6c, 0x2e, 0x4e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74,
+	0x6f, 0x72, 0x2e, 0x4e, 0x41, 0x70, 0x69, 0x2e, 0x54, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61,
+	0x74, 0x65, 0x52, 0x07, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x6e, 0x64, 0x1a, 0x4c, 0x0a, 0x0c, 0x54,
+	0x43, 0x6f, 0x6e, 0x6a, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x3c, 0x0a, 0x08, 0x6f,
+	0x70, 0x65, 0x72, 0x61, 0x6e, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e,
 	0x4e, 0x59, 0x71, 0x6c, 0x2e, 0x4e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x2e,
-	0x4e, 0x41, 0x70, 0x69, 0x2e, 0x54, 0x43, 0x6f, 0x6e, 0x74, 0x69, 0x6e, 0x75, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x52, 0x0c, 0x63, 0x6f, 0x6e, 0x74, 0x69, 0x6e, 0x75, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x12, 0x32, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x64, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x1c, 0x2e, 0x4e, 0x59, 0x71, 0x6c, 0x2e, 0x4e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f,
-	0x72, 0x2e, 0x4e, 0x41, 0x70, 0x69, 0x2e, 0x54, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x05, 0x65,
-	0x72, 0x72, 0x6f, 0x72, 0x1a, 0xaa, 0x01, 0x0a, 0x0a, 0x54, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e,
-	0x53, 0x65, 0x74, 0x12, 0x1f, 0x0a, 0x04, 0x6d, 0x65, 0x74, 0x61, 0x18, 0x01, 0x20, 0x03, 0x28,
-	0x0b, 0x32, 0x0b, 0x2e, 0x59, 0x64, 0x62, 0x2e, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x52, 0x04,
-	0x6d, 0x65, 0x74, 0x61, 0x12, 0x50, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x02, 0x20, 0x03,
-	0x28, 0x0b, 0x32, 0x3c, 0x2e, 0x4e, 0x59, 0x71, 0x6c, 0x2e, 0x4e, 0x43, 0x6f, 0x6e, 0x6e, 0x65,
-	0x63, 0x74, 0x6f, 0x72, 0x2e, 0x4e, 0x41, 0x70, 0x69, 0x2e, 0x54, 0x52, 0x65, 0x61, 0x64, 0x53,
-	0x70, 0x6c, 0x69, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x54, 0x43,
-	0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x53, 0x65, 0x74, 0x2e, 0x54, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e,
-	0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x1a, 0x29, 0x0a, 0x07, 0x54, 0x43, 0x6f, 0x6c, 0x75, 0x6d,
-	0x6e, 0x12, 0x1e, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32,
-	0x0a, 0x2e, 0x59, 0x64, 0x62, 0x2e, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x04, 0x64, 0x61, 0x74,
-	0x61, 0x42, 0x09, 0x0a, 0x07, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x22, 0x37, 0x0a, 0x0b,
-	0x54, 0x50, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x72,
-	0x6f, 0x77, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x04, 0x72, 0x6f, 0x77, 0x73, 0x12,
-	0x14, 0x0a, 0x05, 0x62, 0x79, 0x74, 0x65, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, 0x05,
-	0x62, 0x79, 0x74, 0x65, 0x73, 0x22, 0x3e, 0x0a, 0x0d, 0x54, 0x43, 0x6f, 0x6e, 0x74, 0x69, 0x6e,
-	0x75, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x22, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69,
-	0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x48, 0x00, 0x52, 0x0b, 0x64,
-	0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x09, 0x0a, 0x07, 0x70, 0x61,
-	0x79, 0x6c, 0x6f, 0x61, 0x64, 0x22, 0xd5, 0x0b, 0x0a, 0x07, 0x54, 0x46, 0x69, 0x6c, 0x74, 0x65,
-	0x72, 0x12, 0x4b, 0x0a, 0x0a, 0x63, 0x6f, 0x6d, 0x70, 0x61, 0x72, 0x69, 0x73, 0x6f, 0x6e, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x4e, 0x59, 0x71, 0x6c, 0x2e, 0x4e, 0x43, 0x6f,
-	0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x2e, 0x4e, 0x41, 0x70, 0x69, 0x2e, 0x54, 0x46, 0x69,
-	0x6c, 0x74, 0x65, 0x72, 0x2e, 0x54, 0x43, 0x6f, 0x6d, 0x70, 0x61, 0x72, 0x69, 0x73, 0x6f, 0x6e,
-	0x48, 0x00, 0x52, 0x0a, 0x63, 0x6f, 0x6d, 0x70, 0x61, 0x72, 0x69, 0x73, 0x6f, 0x6e, 0x12, 0x4e,
-	0x0a, 0x0b, 0x63, 0x6f, 0x6e, 0x6a, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x4e, 0x59, 0x71, 0x6c, 0x2e, 0x4e, 0x43, 0x6f, 0x6e, 0x6e,
-	0x65, 0x63, 0x74, 0x6f, 0x72, 0x2e, 0x4e, 0x41, 0x70, 0x69, 0x2e, 0x54, 0x46, 0x69, 0x6c, 0x74,
-	0x65, 0x72, 0x2e, 0x54, 0x43, 0x6f, 0x6e, 0x6a, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x48,
-	0x00, 0x52, 0x0b, 0x63, 0x6f, 0x6e, 0x6a, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x4e,
-	0x0a, 0x0b, 0x64, 0x69, 0x73, 0x6a, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x4e, 0x59, 0x71, 0x6c, 0x2e, 0x4e, 0x43, 0x6f, 0x6e, 0x6e,
-	0x65, 0x63, 0x74, 0x6f, 0x72, 0x2e, 0x4e, 0x41, 0x70, 0x69, 0x2e, 0x54, 0x46, 0x69, 0x6c, 0x74,
-	0x65, 0x72, 0x2e, 0x54, 0x44, 0x69, 0x73, 0x6a, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x48,
-	0x00, 0x52, 0x0b, 0x64, 0x69, 0x73, 0x6a, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x45,
-	0x0a, 0x08, 0x6e, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x27, 0x2e, 0x4e, 0x59, 0x71, 0x6c, 0x2e, 0x4e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74,
-	0x6f, 0x72, 0x2e, 0x4e, 0x41, 0x70, 0x69, 0x2e, 0x54, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x2e,
-	0x54, 0x4e, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x48, 0x00, 0x52, 0x08, 0x6e, 0x65, 0x67,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x43, 0x0a, 0x08, 0x73, 0x75, 0x62, 0x5f, 0x65, 0x78, 0x70,
-	0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x4e, 0x59, 0x71, 0x6c, 0x2e, 0x4e,
-	0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x2e, 0x4e, 0x41, 0x70, 0x69, 0x2e, 0x54,
-	0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x2e, 0x54, 0x53, 0x75, 0x62, 0x45, 0x78, 0x70, 0x72, 0x48,
-	0x00, 0x52, 0x07, 0x73, 0x75, 0x62, 0x45, 0x78, 0x70, 0x72, 0x1a, 0xa4, 0x06, 0x0a, 0x0b, 0x54,
-	0x43, 0x6f, 0x6d, 0x70, 0x61, 0x72, 0x69, 0x73, 0x6f, 0x6e, 0x12, 0x4b, 0x0a, 0x06, 0x62, 0x69,
-	0x6e, 0x61, 0x72, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x4e, 0x59, 0x71,
-	0x6c, 0x2e, 0x4e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x2e, 0x4e, 0x41, 0x70,
-	0x69, 0x2e, 0x54, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x2e, 0x54, 0x43, 0x6f, 0x6d, 0x70, 0x61,
-	0x72, 0x69, 0x73, 0x6f, 0x6e, 0x2e, 0x54, 0x42, 0x69, 0x6e, 0x61, 0x72, 0x79, 0x48, 0x00, 0x52,
-	0x06, 0x62, 0x69, 0x6e, 0x61, 0x72, 0x79, 0x12, 0x4c, 0x0a, 0x07, 0x69, 0x73, 0x5f, 0x6e, 0x75,
-	0x6c, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x4e, 0x59, 0x71, 0x6c, 0x2e,
+	0x4e, 0x41, 0x70, 0x69, 0x2e, 0x54, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x52,
+	0x08, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x6e, 0x64, 0x73, 0x1a, 0x4c, 0x0a, 0x0c, 0x54, 0x44, 0x69,
+	0x73, 0x6a, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x3c, 0x0a, 0x08, 0x6f, 0x70, 0x65,
+	0x72, 0x61, 0x6e, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x4e, 0x59,
+	0x71, 0x6c, 0x2e, 0x4e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x2e, 0x4e, 0x41,
+	0x70, 0x69, 0x2e, 0x54, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x52, 0x08, 0x6f,
+	0x70, 0x65, 0x72, 0x61, 0x6e, 0x64, 0x73, 0x1a, 0xbb, 0x01, 0x0a, 0x08, 0x54, 0x42, 0x65, 0x74,
+	0x77, 0x65, 0x65, 0x6e, 0x12, 0x37, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x4e, 0x59, 0x71, 0x6c, 0x2e, 0x4e, 0x43, 0x6f, 0x6e, 0x6e,
+	0x65, 0x63, 0x74, 0x6f, 0x72, 0x2e, 0x4e, 0x41, 0x70, 0x69, 0x2e, 0x54, 0x45, 0x78, 0x70, 0x72,
+	0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x37, 0x0a,
+	0x05, 0x6c, 0x65, 0x61, 0x73, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x4e,
+	0x59, 0x71, 0x6c, 0x2e, 0x4e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x2e, 0x4e,
+	0x41, 0x70, 0x69, 0x2e, 0x54, 0x45, 0x78, 0x70, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x52,
+	0x05, 0x6c, 0x65, 0x61, 0x73, 0x74, 0x12, 0x3d, 0x0a, 0x08, 0x67, 0x72, 0x65, 0x61, 0x74, 0x65,
+	0x73, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x4e, 0x59, 0x71, 0x6c, 0x2e,
 	0x4e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x2e, 0x4e, 0x41, 0x70, 0x69, 0x2e,
-	0x54, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x2e, 0x54, 0x43, 0x6f, 0x6d, 0x70, 0x61, 0x72, 0x69,
-	0x73, 0x6f, 0x6e, 0x2e, 0x54, 0x49, 0x73, 0x4e, 0x75, 0x6c, 0x6c, 0x48, 0x00, 0x52, 0x06, 0x69,
-	0x73, 0x4e, 0x75, 0x6c, 0x6c, 0x12, 0x56, 0x0a, 0x0b, 0x69, 0x73, 0x5f, 0x6e, 0x6f, 0x74, 0x5f,
-	0x6e, 0x75, 0x6c, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x34, 0x2e, 0x4e, 0x59, 0x71,
-	0x6c, 0x2e, 0x4e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x2e, 0x4e, 0x41, 0x70,
-	0x69, 0x2e, 0x54, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x2e, 0x54, 0x43, 0x6f, 0x6d, 0x70, 0x61,
-	0x72, 0x69, 0x73, 0x6f, 0x6e, 0x2e, 0x54, 0x49, 0x73, 0x4e, 0x6f, 0x74, 0x4e, 0x75, 0x6c, 0x6c,
-	0x48, 0x00, 0x52, 0x09, 0x69, 0x73, 0x4e, 0x6f, 0x74, 0x4e, 0x75, 0x6c, 0x6c, 0x12, 0x3f, 0x0a,
-	0x02, 0x69, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2d, 0x2e, 0x4e, 0x59, 0x71, 0x6c,
-	0x2e, 0x4e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x2e, 0x4e, 0x41, 0x70, 0x69,
-	0x2e, 0x54, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x2e, 0x54, 0x43, 0x6f, 0x6d, 0x70, 0x61, 0x72,
-	0x69, 0x73, 0x6f, 0x6e, 0x2e, 0x54, 0x49, 0x6e, 0x48, 0x00, 0x52, 0x02, 0x69, 0x6e, 0x12, 0x4e,
-	0x0a, 0x07, 0x62, 0x65, 0x74, 0x77, 0x65, 0x65, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x32, 0x2e, 0x4e, 0x59, 0x71, 0x6c, 0x2e, 0x4e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f,
-	0x72, 0x2e, 0x4e, 0x41, 0x70, 0x69, 0x2e, 0x54, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x2e, 0x54,
-	0x43, 0x6f, 0x6d, 0x70, 0x61, 0x72, 0x69, 0x73, 0x6f, 0x6e, 0x2e, 0x54, 0x42, 0x65, 0x74, 0x77,
-	0x65, 0x65, 0x6e, 0x48, 0x00, 0x52, 0x07, 0x62, 0x65, 0x74, 0x77, 0x65, 0x65, 0x6e, 0x1a, 0xac,
-	0x01, 0x0a, 0x07, 0x54, 0x42, 0x69, 0x6e, 0x61, 0x72, 0x79, 0x12, 0x32, 0x0a, 0x0b, 0x74, 0x79,
-	0x70, 0x65, 0x64, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x0f, 0x2e, 0x59, 0x64, 0x62, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x64, 0x56, 0x61, 0x6c, 0x75, 0x65,
-	0x48, 0x00, 0x52, 0x0a, 0x74, 0x79, 0x70, 0x65, 0x64, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x18,
-	0x0a, 0x06, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00,
-	0x52, 0x06, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x22, 0x48, 0x0a, 0x0a, 0x45, 0x4f, 0x70, 0x65,
-	0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x0c, 0x0a, 0x08, 0x52, 0x45, 0x53, 0x45, 0x52, 0x56,
-	0x45, 0x44, 0x10, 0x00, 0x12, 0x05, 0x0a, 0x01, 0x4c, 0x10, 0x01, 0x12, 0x06, 0x0a, 0x02, 0x4c,
-	0x45, 0x10, 0x02, 0x12, 0x06, 0x0a, 0x02, 0x45, 0x51, 0x10, 0x03, 0x12, 0x06, 0x0a, 0x02, 0x4e,
-	0x45, 0x10, 0x04, 0x12, 0x06, 0x0a, 0x02, 0x47, 0x45, 0x10, 0x05, 0x12, 0x05, 0x0a, 0x01, 0x47,
-	0x10, 0x06, 0x42, 0x09, 0x0a, 0x07, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x1a, 0x21, 0x0a,
-	0x07, 0x54, 0x49, 0x73, 0x4e, 0x75, 0x6c, 0x6c, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x6f, 0x6c, 0x75,
-	0x6d, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e,
-	0x1a, 0x24, 0x0a, 0x0a, 0x54, 0x49, 0x73, 0x4e, 0x6f, 0x74, 0x4e, 0x75, 0x6c, 0x6c, 0x12, 0x16,
-	0x0a, 0x06, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06,
-	0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x1a, 0x2e, 0x0a, 0x03, 0x54, 0x49, 0x6e, 0x12, 0x27, 0x0a,
-	0x06, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0f, 0x2e,
-	0x59, 0x64, 0x62, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x64, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x06,
-	0x76, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x1a, 0x5e, 0x0a, 0x08, 0x54, 0x42, 0x65, 0x74, 0x77, 0x65,
-	0x65, 0x6e, 0x12, 0x25, 0x0a, 0x05, 0x6c, 0x65, 0x61, 0x73, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x0f, 0x2e, 0x59, 0x64, 0x62, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x64, 0x56, 0x61, 0x6c,
-	0x75, 0x65, 0x52, 0x05, 0x6c, 0x65, 0x61, 0x73, 0x74, 0x12, 0x2b, 0x0a, 0x08, 0x67, 0x72, 0x65,
-	0x61, 0x74, 0x65, 0x73, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x59, 0x64,
-	0x62, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x64, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x08, 0x67, 0x72,
-	0x65, 0x61, 0x74, 0x65, 0x73, 0x74, 0x42, 0x09, 0x0a, 0x07, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61,
-	0x64, 0x1a, 0x49, 0x0a, 0x0c, 0x54, 0x43, 0x6f, 0x6e, 0x6a, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f,
-	0x6e, 0x12, 0x39, 0x0a, 0x08, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x6e, 0x64, 0x73, 0x18, 0x01, 0x20,
-	0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x4e, 0x59, 0x71, 0x6c, 0x2e, 0x4e, 0x43, 0x6f, 0x6e, 0x6e,
-	0x65, 0x63, 0x74, 0x6f, 0x72, 0x2e, 0x4e, 0x41, 0x70, 0x69, 0x2e, 0x54, 0x46, 0x69, 0x6c, 0x74,
-	0x65, 0x72, 0x52, 0x08, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x6e, 0x64, 0x73, 0x1a, 0x49, 0x0a, 0x0c,
-	0x54, 0x44, 0x69, 0x73, 0x6a, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x39, 0x0a, 0x08,
-	0x6f, 0x70, 0x65, 0x72, 0x61, 0x6e, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d,
-	0x2e, 0x4e, 0x59, 0x71, 0x6c, 0x2e, 0x4e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72,
-	0x2e, 0x4e, 0x41, 0x70, 0x69, 0x2e, 0x54, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x52, 0x08, 0x6f,
-	0x70, 0x65, 0x72, 0x61, 0x6e, 0x64, 0x73, 0x1a, 0x44, 0x0a, 0x09, 0x54, 0x4e, 0x65, 0x67, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x12, 0x37, 0x0a, 0x07, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x6e, 0x64, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x4e, 0x59, 0x71, 0x6c, 0x2e, 0x4e, 0x43, 0x6f,
-	0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x2e, 0x4e, 0x41, 0x70, 0x69, 0x2e, 0x54, 0x46, 0x69,
-	0x6c, 0x74, 0x65, 0x72, 0x52, 0x07, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x6e, 0x64, 0x1a, 0x43, 0x0a,
-	0x08, 0x54, 0x53, 0x75, 0x62, 0x45, 0x78, 0x70, 0x72, 0x12, 0x37, 0x0a, 0x07, 0x6f, 0x70, 0x65,
-	0x72, 0x61, 0x6e, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x4e, 0x59, 0x71,
-	0x6c, 0x2e, 0x4e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x2e, 0x4e, 0x41, 0x70,
-	0x69, 0x2e, 0x54, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x52, 0x07, 0x6f, 0x70, 0x65, 0x72, 0x61,
-	0x6e, 0x64, 0x42, 0x09, 0x0a, 0x07, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x22, 0x86, 0x01,
-	0x0a, 0x06, 0x54, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x31, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74,
-	0x75, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x19, 0x2e, 0x59, 0x64, 0x62, 0x2e, 0x53,
-	0x74, 0x61, 0x74, 0x75, 0x73, 0x49, 0x64, 0x73, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x43,
-	0x6f, 0x64, 0x65, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x6d,
-	0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65,
-	0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x2f, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x65, 0x73, 0x18,
-	0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x59, 0x64, 0x62, 0x2e, 0x49, 0x73, 0x73, 0x75,
-	0x65, 0x2e, 0x49, 0x73, 0x73, 0x75, 0x65, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x06,
-	0x69, 0x73, 0x73, 0x75, 0x65, 0x73, 0x22, 0xa0, 0x01, 0x0a, 0x04, 0x54, 0x41, 0x73, 0x74, 0x12,
-	0x14, 0x0a, 0x04, 0x61, 0x74, 0x6f, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x48, 0x00, 0x52,
-	0x04, 0x61, 0x74, 0x6f, 0x6d, 0x12, 0x36, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x4e, 0x59, 0x71, 0x6c, 0x2e, 0x4e, 0x43, 0x6f, 0x6e, 0x6e,
-	0x65, 0x63, 0x74, 0x6f, 0x72, 0x2e, 0x4e, 0x41, 0x70, 0x69, 0x2e, 0x54, 0x41, 0x73, 0x74, 0x2e,
-	0x54, 0x4c, 0x69, 0x73, 0x74, 0x48, 0x00, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x1a, 0x3f, 0x0a,
-	0x05, 0x54, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x36, 0x0a, 0x08, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x72,
-	0x65, 0x6e, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x4e, 0x59, 0x71, 0x6c, 0x2e,
+	0x54, 0x45, 0x78, 0x70, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x08, 0x67, 0x72, 0x65,
+	0x61, 0x74, 0x65, 0x73, 0x74, 0x1a, 0x73, 0x0a, 0x03, 0x54, 0x49, 0x6e, 0x12, 0x37, 0x0a, 0x05,
+	0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x4e, 0x59,
+	0x71, 0x6c, 0x2e, 0x4e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x2e, 0x4e, 0x41,
+	0x70, 0x69, 0x2e, 0x54, 0x45, 0x78, 0x70, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x05,
+	0x76, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x33, 0x0a, 0x03, 0x73, 0x65, 0x74, 0x18, 0x02, 0x20, 0x03,
+	0x28, 0x0b, 0x32, 0x21, 0x2e, 0x4e, 0x59, 0x71, 0x6c, 0x2e, 0x4e, 0x43, 0x6f, 0x6e, 0x6e, 0x65,
+	0x63, 0x74, 0x6f, 0x72, 0x2e, 0x4e, 0x41, 0x70, 0x69, 0x2e, 0x54, 0x45, 0x78, 0x70, 0x72, 0x65,
+	0x73, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x03, 0x73, 0x65, 0x74, 0x1a, 0x42, 0x0a, 0x07, 0x54, 0x49,
+	0x73, 0x4e, 0x75, 0x6c, 0x6c, 0x12, 0x37, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x4e, 0x59, 0x71, 0x6c, 0x2e, 0x4e, 0x43, 0x6f, 0x6e,
+	0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x2e, 0x4e, 0x41, 0x70, 0x69, 0x2e, 0x54, 0x45, 0x78, 0x70,
+	0x72, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x1a, 0x45,
+	0x0a, 0x0a, 0x54, 0x49, 0x73, 0x4e, 0x6f, 0x74, 0x4e, 0x75, 0x6c, 0x6c, 0x12, 0x37, 0x0a, 0x05,
+	0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x4e, 0x59,
+	0x71, 0x6c, 0x2e, 0x4e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x2e, 0x4e, 0x41,
+	0x70, 0x69, 0x2e, 0x54, 0x45, 0x78, 0x70, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x05,
+	0x76, 0x61, 0x6c, 0x75, 0x65, 0x1a, 0xb4, 0x02, 0x0a, 0x0b, 0x54, 0x43, 0x6f, 0x6d, 0x70, 0x61,
+	0x72, 0x69, 0x73, 0x6f, 0x6e, 0x12, 0x55, 0x0a, 0x09, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69,
+	0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x37, 0x2e, 0x4e, 0x59, 0x71, 0x6c, 0x2e,
 	0x4e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x2e, 0x4e, 0x41, 0x70, 0x69, 0x2e,
-	0x54, 0x41, 0x73, 0x74, 0x52, 0x08, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x72, 0x65, 0x6e, 0x42, 0x09,
-	0x0a, 0x07, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x42, 0x53, 0x5a, 0x51, 0x61, 0x2e, 0x79,
-	0x61, 0x6e, 0x64, 0x65, 0x78, 0x2d, 0x74, 0x65, 0x61, 0x6d, 0x2e, 0x72, 0x75, 0x2f, 0x79, 0x64,
-	0x62, 0x2f, 0x6c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x2f, 0x79, 0x71, 0x6c, 0x2f, 0x70, 0x72,
-	0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x73, 0x2f, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x2f,
-	0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x2f, 0x6c, 0x69, 0x62, 0x67, 0x6f, 0x2f,
-	0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x62, 0x06,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x54, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x2e, 0x54, 0x43, 0x6f, 0x6d, 0x70,
+	0x61, 0x72, 0x69, 0x73, 0x6f, 0x6e, 0x2e, 0x45, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x52, 0x09, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x40, 0x0a, 0x0a,
+	0x6c, 0x65, 0x66, 0x74, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x21, 0x2e, 0x4e, 0x59, 0x71, 0x6c, 0x2e, 0x4e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74,
+	0x6f, 0x72, 0x2e, 0x4e, 0x41, 0x70, 0x69, 0x2e, 0x54, 0x45, 0x78, 0x70, 0x72, 0x65, 0x73, 0x73,
+	0x69, 0x6f, 0x6e, 0x52, 0x09, 0x6c, 0x65, 0x66, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x42,
+	0x0a, 0x0b, 0x72, 0x69, 0x67, 0x68, 0x74, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x03, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x4e, 0x59, 0x71, 0x6c, 0x2e, 0x4e, 0x43, 0x6f, 0x6e, 0x6e,
+	0x65, 0x63, 0x74, 0x6f, 0x72, 0x2e, 0x4e, 0x41, 0x70, 0x69, 0x2e, 0x54, 0x45, 0x78, 0x70, 0x72,
+	0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x0a, 0x72, 0x69, 0x67, 0x68, 0x74, 0x56, 0x61, 0x6c,
+	0x75, 0x65, 0x22, 0x48, 0x0a, 0x0a, 0x45, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x12, 0x0c, 0x0a, 0x08, 0x52, 0x45, 0x53, 0x45, 0x52, 0x56, 0x45, 0x44, 0x10, 0x00, 0x12, 0x05,
+	0x0a, 0x01, 0x4c, 0x10, 0x01, 0x12, 0x06, 0x0a, 0x02, 0x4c, 0x45, 0x10, 0x02, 0x12, 0x06, 0x0a,
+	0x02, 0x45, 0x51, 0x10, 0x03, 0x12, 0x06, 0x0a, 0x02, 0x4e, 0x45, 0x10, 0x04, 0x12, 0x06, 0x0a,
+	0x02, 0x47, 0x45, 0x10, 0x05, 0x12, 0x05, 0x0a, 0x01, 0x47, 0x10, 0x06, 0x42, 0x09, 0x0a, 0x07,
+	0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x22, 0x86, 0x01, 0x0a, 0x06, 0x54, 0x45, 0x72, 0x72,
+	0x6f, 0x72, 0x12, 0x31, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x0e, 0x32, 0x19, 0x2e, 0x59, 0x64, 0x62, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x49,
+	0x64, 0x73, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x06, 0x73,
+	0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12,
+	0x2f, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32,
+	0x17, 0x2e, 0x59, 0x64, 0x62, 0x2e, 0x49, 0x73, 0x73, 0x75, 0x65, 0x2e, 0x49, 0x73, 0x73, 0x75,
+	0x65, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x65, 0x73,
+	0x22, 0xa0, 0x01, 0x0a, 0x04, 0x54, 0x41, 0x73, 0x74, 0x12, 0x14, 0x0a, 0x04, 0x61, 0x74, 0x6f,
+	0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x48, 0x00, 0x52, 0x04, 0x61, 0x74, 0x6f, 0x6d, 0x12,
+	0x36, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e,
+	0x4e, 0x59, 0x71, 0x6c, 0x2e, 0x4e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x2e,
+	0x4e, 0x41, 0x70, 0x69, 0x2e, 0x54, 0x41, 0x73, 0x74, 0x2e, 0x54, 0x4c, 0x69, 0x73, 0x74, 0x48,
+	0x00, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x1a, 0x3f, 0x0a, 0x05, 0x54, 0x4c, 0x69, 0x73, 0x74,
+	0x12, 0x36, 0x0a, 0x08, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x72, 0x65, 0x6e, 0x18, 0x01, 0x20, 0x03,
+	0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x4e, 0x59, 0x71, 0x6c, 0x2e, 0x4e, 0x43, 0x6f, 0x6e, 0x6e, 0x65,
+	0x63, 0x74, 0x6f, 0x72, 0x2e, 0x4e, 0x41, 0x70, 0x69, 0x2e, 0x54, 0x41, 0x73, 0x74, 0x52, 0x08,
+	0x63, 0x68, 0x69, 0x6c, 0x64, 0x72, 0x65, 0x6e, 0x42, 0x09, 0x0a, 0x07, 0x70, 0x61, 0x79, 0x6c,
+	0x6f, 0x61, 0x64, 0x42, 0x53, 0x5a, 0x51, 0x61, 0x2e, 0x79, 0x61, 0x6e, 0x64, 0x65, 0x78, 0x2d,
+	0x74, 0x65, 0x61, 0x6d, 0x2e, 0x72, 0x75, 0x2f, 0x79, 0x64, 0x62, 0x2f, 0x6c, 0x69, 0x62, 0x72,
+	0x61, 0x72, 0x79, 0x2f, 0x79, 0x71, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72,
+	0x73, 0x2f, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x2f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63,
+	0x74, 0x6f, 0x72, 0x2f, 0x6c, 0x69, 0x62, 0x67, 0x6f, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63,
+	0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -2834,11 +2795,11 @@ func file_ydb_library_yql_providers_generic_connector_api_service_protos_connect
 }
 
 var file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_enumTypes = make([]protoimpl.EnumInfo, 3)
-var file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes = make([]protoimpl.MessageInfo, 34)
+var file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes = make([]protoimpl.MessageInfo, 33)
 var file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_goTypes = []interface{}{
 	(TReadSplitsRequest_EMode)(0),                  // 0: NYql.NConnector.NApi.TReadSplitsRequest.EMode
 	(TReadSplitsRequest_EFormat)(0),                // 1: NYql.NConnector.NApi.TReadSplitsRequest.EFormat
-	(TFilter_TComparison_TBinary_EOperation)(0),    // 2: NYql.NConnector.NApi.TFilter.TComparison.TBinary.EOperation
+	(TPredicate_TComparison_EOperation)(0),         // 2: NYql.NConnector.NApi.TPredicate.TComparison.EOperation
 	(*TListTablesRequest)(nil),                     // 3: NYql.NConnector.NApi.TListTablesRequest
 	(*TListTablesResponse)(nil),                    // 4: NYql.NConnector.NApi.TListTablesResponse
 	(*TDescribeTableRequest)(nil),                  // 5: NYql.NConnector.NApi.TDescribeTableRequest
@@ -2852,93 +2813,96 @@ var file_ydb_library_yql_providers_generic_connector_api_service_protos_connecto
 	(*TReadSplitsResponse)(nil),                    // 13: NYql.NConnector.NApi.TReadSplitsResponse
 	(*TPagination)(nil),                            // 14: NYql.NConnector.NApi.TPagination
 	(*TContinuation)(nil),                          // 15: NYql.NConnector.NApi.TContinuation
-	(*TFilter)(nil),                                // 16: NYql.NConnector.NApi.TFilter
-	(*TError)(nil),                                 // 17: NYql.NConnector.NApi.TError
-	(*TAst)(nil),                                   // 18: NYql.NConnector.NApi.TAst
-	(*TSelect_TWhat)(nil),                          // 19: NYql.NConnector.NApi.TSelect.TWhat
-	(*TSelect_TFrom)(nil),                          // 20: NYql.NConnector.NApi.TSelect.TFrom
-	(*TSelect_TWhere)(nil),                         // 21: NYql.NConnector.NApi.TSelect.TWhere
-	(*TSelect_TLimit)(nil),                         // 22: NYql.NConnector.NApi.TSelect.TLimit
-	(*TSelect_TWhat_TItem)(nil),                    // 23: NYql.NConnector.NApi.TSelect.TWhat.TItem
-	(*TReadSplitsResponse_TColumnSet)(nil),         // 24: NYql.NConnector.NApi.TReadSplitsResponse.TColumnSet
-	(*TReadSplitsResponse_TColumnSet_TColumn)(nil), // 25: NYql.NConnector.NApi.TReadSplitsResponse.TColumnSet.TColumn
-	(*TFilter_TComparison)(nil),                    // 26: NYql.NConnector.NApi.TFilter.TComparison
-	(*TFilter_TConjunction)(nil),                   // 27: NYql.NConnector.NApi.TFilter.TConjunction
-	(*TFilter_TDisjunction)(nil),                   // 28: NYql.NConnector.NApi.TFilter.TDisjunction
-	(*TFilter_TNegation)(nil),                      // 29: NYql.NConnector.NApi.TFilter.TNegation
-	(*TFilter_TSubExpr)(nil),                       // 30: NYql.NConnector.NApi.TFilter.TSubExpr
-	(*TFilter_TComparison_TBinary)(nil),            // 31: NYql.NConnector.NApi.TFilter.TComparison.TBinary
-	(*TFilter_TComparison_TIsNull)(nil),            // 32: NYql.NConnector.NApi.TFilter.TComparison.TIsNull
-	(*TFilter_TComparison_TIsNotNull)(nil),         // 33: NYql.NConnector.NApi.TFilter.TComparison.TIsNotNull
-	(*TFilter_TComparison_TIn)(nil),                // 34: NYql.NConnector.NApi.TFilter.TComparison.TIn
-	(*TFilter_TComparison_TBetween)(nil),           // 35: NYql.NConnector.NApi.TFilter.TComparison.TBetween
-	(*TAst_TList)(nil),                             // 36: NYql.NConnector.NApi.TAst.TList
-	(*common.TDataSourceInstance)(nil),             // 37: NYql.NConnector.NApi.TDataSourceInstance
-	(*Ydb.Column)(nil),                             // 38: Ydb.Column
+	(*TExpression)(nil),                            // 16: NYql.NConnector.NApi.TExpression
+	(*TPredicate)(nil),                             // 17: NYql.NConnector.NApi.TPredicate
+	(*TError)(nil),                                 // 18: NYql.NConnector.NApi.TError
+	(*TAst)(nil),                                   // 19: NYql.NConnector.NApi.TAst
+	(*TSelect_TWhat)(nil),                          // 20: NYql.NConnector.NApi.TSelect.TWhat
+	(*TSelect_TFrom)(nil),                          // 21: NYql.NConnector.NApi.TSelect.TFrom
+	(*TSelect_TWhere)(nil),                         // 22: NYql.NConnector.NApi.TSelect.TWhere
+	(*TSelect_TLimit)(nil),                         // 23: NYql.NConnector.NApi.TSelect.TLimit
+	(*TSelect_TWhat_TItem)(nil),                    // 24: NYql.NConnector.NApi.TSelect.TWhat.TItem
+	(*TReadSplitsResponse_TColumnSet)(nil),         // 25: NYql.NConnector.NApi.TReadSplitsResponse.TColumnSet
+	(*TReadSplitsResponse_TColumnSet_TColumn)(nil), // 26: NYql.NConnector.NApi.TReadSplitsResponse.TColumnSet.TColumn
+	(*TPredicate_TNegation)(nil),                   // 27: NYql.NConnector.NApi.TPredicate.TNegation
+	(*TPredicate_TConjunction)(nil),                // 28: NYql.NConnector.NApi.TPredicate.TConjunction
+	(*TPredicate_TDisjunction)(nil),                // 29: NYql.NConnector.NApi.TPredicate.TDisjunction
+	(*TPredicate_TBetween)(nil),                    // 30: NYql.NConnector.NApi.TPredicate.TBetween
+	(*TPredicate_TIn)(nil),                         // 31: NYql.NConnector.NApi.TPredicate.TIn
+	(*TPredicate_TIsNull)(nil),                     // 32: NYql.NConnector.NApi.TPredicate.TIsNull
+	(*TPredicate_TIsNotNull)(nil),                  // 33: NYql.NConnector.NApi.TPredicate.TIsNotNull
+	(*TPredicate_TComparison)(nil),                 // 34: NYql.NConnector.NApi.TPredicate.TComparison
+	(*TAst_TList)(nil),                             // 35: NYql.NConnector.NApi.TAst.TList
+	(*common.TDataSourceInstance)(nil),             // 36: NYql.NConnector.NApi.TDataSourceInstance
+	(*Ydb.Column)(nil),                             // 37: Ydb.Column
+	(*Ydb.TypedValue)(nil),                         // 38: Ydb.TypedValue
 	(Ydb.StatusIds_StatusCode)(0),                  // 39: Ydb.StatusIds.StatusCode
 	(*Ydb_Issue.IssueMessage)(nil),                 // 40: Ydb.Issue.IssueMessage
 	(*Ydb.Value)(nil),                              // 41: Ydb.Value
-	(*Ydb.TypedValue)(nil),                         // 42: Ydb.TypedValue
 }
 var file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_depIdxs = []int32{
-	37, // 0: NYql.NConnector.NApi.TListTablesRequest.data_source_instance:type_name -> NYql.NConnector.NApi.TDataSourceInstance
-	17, // 1: NYql.NConnector.NApi.TListTablesResponse.error:type_name -> NYql.NConnector.NApi.TError
-	37, // 2: NYql.NConnector.NApi.TDescribeTableRequest.data_source_instance:type_name -> NYql.NConnector.NApi.TDataSourceInstance
+	36, // 0: NYql.NConnector.NApi.TListTablesRequest.data_source_instance:type_name -> NYql.NConnector.NApi.TDataSourceInstance
+	18, // 1: NYql.NConnector.NApi.TListTablesResponse.error:type_name -> NYql.NConnector.NApi.TError
+	36, // 2: NYql.NConnector.NApi.TDescribeTableRequest.data_source_instance:type_name -> NYql.NConnector.NApi.TDataSourceInstance
 	7,  // 3: NYql.NConnector.NApi.TDescribeTableResponse.schema:type_name -> NYql.NConnector.NApi.TSchema
-	17, // 4: NYql.NConnector.NApi.TDescribeTableResponse.error:type_name -> NYql.NConnector.NApi.TError
-	38, // 5: NYql.NConnector.NApi.TSchema.columns:type_name -> Ydb.Column
+	18, // 4: NYql.NConnector.NApi.TDescribeTableResponse.error:type_name -> NYql.NConnector.NApi.TError
+	37, // 5: NYql.NConnector.NApi.TSchema.columns:type_name -> Ydb.Column
 	10, // 6: NYql.NConnector.NApi.TListSplitsRequest.selects:type_name -> NYql.NConnector.NApi.TSelect
 	11, // 7: NYql.NConnector.NApi.TListSplitsResponse.splits:type_name -> NYql.NConnector.NApi.TSplit
-	17, // 8: NYql.NConnector.NApi.TListSplitsResponse.error:type_name -> NYql.NConnector.NApi.TError
-	37, // 9: NYql.NConnector.NApi.TSelect.data_source_instance:type_name -> NYql.NConnector.NApi.TDataSourceInstance
-	19, // 10: NYql.NConnector.NApi.TSelect.what:type_name -> NYql.NConnector.NApi.TSelect.TWhat
-	20, // 11: NYql.NConnector.NApi.TSelect.from:type_name -> NYql.NConnector.NApi.TSelect.TFrom
-	21, // 12: NYql.NConnector.NApi.TSelect.where:type_name -> NYql.NConnector.NApi.TSelect.TWhere
-	22, // 13: NYql.NConnector.NApi.TSelect.limit:type_name -> NYql.NConnector.NApi.TSelect.TLimit
+	18, // 8: NYql.NConnector.NApi.TListSplitsResponse.error:type_name -> NYql.NConnector.NApi.TError
+	36, // 9: NYql.NConnector.NApi.TSelect.data_source_instance:type_name -> NYql.NConnector.NApi.TDataSourceInstance
+	20, // 10: NYql.NConnector.NApi.TSelect.what:type_name -> NYql.NConnector.NApi.TSelect.TWhat
+	21, // 11: NYql.NConnector.NApi.TSelect.from:type_name -> NYql.NConnector.NApi.TSelect.TFrom
+	22, // 12: NYql.NConnector.NApi.TSelect.where:type_name -> NYql.NConnector.NApi.TSelect.TWhere
+	23, // 13: NYql.NConnector.NApi.TSelect.limit:type_name -> NYql.NConnector.NApi.TSelect.TLimit
 	10, // 14: NYql.NConnector.NApi.TSplit.select:type_name -> NYql.NConnector.NApi.TSelect
-	37, // 15: NYql.NConnector.NApi.TReadSplitsRequest.data_source_instance:type_name -> NYql.NConnector.NApi.TDataSourceInstance
+	36, // 15: NYql.NConnector.NApi.TReadSplitsRequest.data_source_instance:type_name -> NYql.NConnector.NApi.TDataSourceInstance
 	11, // 16: NYql.NConnector.NApi.TReadSplitsRequest.splits:type_name -> NYql.NConnector.NApi.TSplit
 	0,  // 17: NYql.NConnector.NApi.TReadSplitsRequest.mode:type_name -> NYql.NConnector.NApi.TReadSplitsRequest.EMode
 	1,  // 18: NYql.NConnector.NApi.TReadSplitsRequest.format:type_name -> NYql.NConnector.NApi.TReadSplitsRequest.EFormat
 	14, // 19: NYql.NConnector.NApi.TReadSplitsRequest.pagination:type_name -> NYql.NConnector.NApi.TPagination
 	15, // 20: NYql.NConnector.NApi.TReadSplitsRequest.continuation:type_name -> NYql.NConnector.NApi.TContinuation
-	24, // 21: NYql.NConnector.NApi.TReadSplitsResponse.column_set:type_name -> NYql.NConnector.NApi.TReadSplitsResponse.TColumnSet
+	25, // 21: NYql.NConnector.NApi.TReadSplitsResponse.column_set:type_name -> NYql.NConnector.NApi.TReadSplitsResponse.TColumnSet
 	15, // 22: NYql.NConnector.NApi.TReadSplitsResponse.continuation:type_name -> NYql.NConnector.NApi.TContinuation
-	17, // 23: NYql.NConnector.NApi.TReadSplitsResponse.error:type_name -> NYql.NConnector.NApi.TError
-	26, // 24: NYql.NConnector.NApi.TFilter.comparison:type_name -> NYql.NConnector.NApi.TFilter.TComparison
-	27, // 25: NYql.NConnector.NApi.TFilter.conjunction:type_name -> NYql.NConnector.NApi.TFilter.TConjunction
-	28, // 26: NYql.NConnector.NApi.TFilter.disjunction:type_name -> NYql.NConnector.NApi.TFilter.TDisjunction
-	29, // 27: NYql.NConnector.NApi.TFilter.negation:type_name -> NYql.NConnector.NApi.TFilter.TNegation
-	30, // 28: NYql.NConnector.NApi.TFilter.sub_expr:type_name -> NYql.NConnector.NApi.TFilter.TSubExpr
-	39, // 29: NYql.NConnector.NApi.TError.status:type_name -> Ydb.StatusIds.StatusCode
-	40, // 30: NYql.NConnector.NApi.TError.issues:type_name -> Ydb.Issue.IssueMessage
-	36, // 31: NYql.NConnector.NApi.TAst.list:type_name -> NYql.NConnector.NApi.TAst.TList
-	23, // 32: NYql.NConnector.NApi.TSelect.TWhat.items:type_name -> NYql.NConnector.NApi.TSelect.TWhat.TItem
-	16, // 33: NYql.NConnector.NApi.TSelect.TWhere.filter_typed:type_name -> NYql.NConnector.NApi.TFilter
-	18, // 34: NYql.NConnector.NApi.TSelect.TWhere.filter_raw:type_name -> NYql.NConnector.NApi.TAst
-	38, // 35: NYql.NConnector.NApi.TSelect.TWhat.TItem.column:type_name -> Ydb.Column
-	38, // 36: NYql.NConnector.NApi.TReadSplitsResponse.TColumnSet.meta:type_name -> Ydb.Column
-	25, // 37: NYql.NConnector.NApi.TReadSplitsResponse.TColumnSet.data:type_name -> NYql.NConnector.NApi.TReadSplitsResponse.TColumnSet.TColumn
-	41, // 38: NYql.NConnector.NApi.TReadSplitsResponse.TColumnSet.TColumn.data:type_name -> Ydb.Value
-	31, // 39: NYql.NConnector.NApi.TFilter.TComparison.binary:type_name -> NYql.NConnector.NApi.TFilter.TComparison.TBinary
-	32, // 40: NYql.NConnector.NApi.TFilter.TComparison.is_null:type_name -> NYql.NConnector.NApi.TFilter.TComparison.TIsNull
-	33, // 41: NYql.NConnector.NApi.TFilter.TComparison.is_not_null:type_name -> NYql.NConnector.NApi.TFilter.TComparison.TIsNotNull
-	34, // 42: NYql.NConnector.NApi.TFilter.TComparison.in:type_name -> NYql.NConnector.NApi.TFilter.TComparison.TIn
-	35, // 43: NYql.NConnector.NApi.TFilter.TComparison.between:type_name -> NYql.NConnector.NApi.TFilter.TComparison.TBetween
-	16, // 44: NYql.NConnector.NApi.TFilter.TConjunction.operands:type_name -> NYql.NConnector.NApi.TFilter
-	16, // 45: NYql.NConnector.NApi.TFilter.TDisjunction.operands:type_name -> NYql.NConnector.NApi.TFilter
-	16, // 46: NYql.NConnector.NApi.TFilter.TNegation.operand:type_name -> NYql.NConnector.NApi.TFilter
-	16, // 47: NYql.NConnector.NApi.TFilter.TSubExpr.operand:type_name -> NYql.NConnector.NApi.TFilter
-	42, // 48: NYql.NConnector.NApi.TFilter.TComparison.TBinary.typed_value:type_name -> Ydb.TypedValue
-	42, // 49: NYql.NConnector.NApi.TFilter.TComparison.TIn.values:type_name -> Ydb.TypedValue
-	42, // 50: NYql.NConnector.NApi.TFilter.TComparison.TBetween.least:type_name -> Ydb.TypedValue
-	42, // 51: NYql.NConnector.NApi.TFilter.TComparison.TBetween.greatest:type_name -> Ydb.TypedValue
-	18, // 52: NYql.NConnector.NApi.TAst.TList.children:type_name -> NYql.NConnector.NApi.TAst
-	53, // [53:53] is the sub-list for method output_type
-	53, // [53:53] is the sub-list for method input_type
-	53, // [53:53] is the sub-list for extension type_name
-	53, // [53:53] is the sub-list for extension extendee
-	0,  // [0:53] is the sub-list for field type_name
+	18, // 23: NYql.NConnector.NApi.TReadSplitsResponse.error:type_name -> NYql.NConnector.NApi.TError
+	38, // 24: NYql.NConnector.NApi.TExpression.typed_value:type_name -> Ydb.TypedValue
+	27, // 25: NYql.NConnector.NApi.TPredicate.negation:type_name -> NYql.NConnector.NApi.TPredicate.TNegation
+	28, // 26: NYql.NConnector.NApi.TPredicate.conjunction:type_name -> NYql.NConnector.NApi.TPredicate.TConjunction
+	29, // 27: NYql.NConnector.NApi.TPredicate.disjunction:type_name -> NYql.NConnector.NApi.TPredicate.TDisjunction
+	30, // 28: NYql.NConnector.NApi.TPredicate.between:type_name -> NYql.NConnector.NApi.TPredicate.TBetween
+	31, // 29: NYql.NConnector.NApi.TPredicate.in:type_name -> NYql.NConnector.NApi.TPredicate.TIn
+	32, // 30: NYql.NConnector.NApi.TPredicate.is_null:type_name -> NYql.NConnector.NApi.TPredicate.TIsNull
+	33, // 31: NYql.NConnector.NApi.TPredicate.is_not_null:type_name -> NYql.NConnector.NApi.TPredicate.TIsNotNull
+	34, // 32: NYql.NConnector.NApi.TPredicate.comparison:type_name -> NYql.NConnector.NApi.TPredicate.TComparison
+	39, // 33: NYql.NConnector.NApi.TError.status:type_name -> Ydb.StatusIds.StatusCode
+	40, // 34: NYql.NConnector.NApi.TError.issues:type_name -> Ydb.Issue.IssueMessage
+	35, // 35: NYql.NConnector.NApi.TAst.list:type_name -> NYql.NConnector.NApi.TAst.TList
+	24, // 36: NYql.NConnector.NApi.TSelect.TWhat.items:type_name -> NYql.NConnector.NApi.TSelect.TWhat.TItem
+	17, // 37: NYql.NConnector.NApi.TSelect.TWhere.filter_typed:type_name -> NYql.NConnector.NApi.TPredicate
+	19, // 38: NYql.NConnector.NApi.TSelect.TWhere.filter_raw:type_name -> NYql.NConnector.NApi.TAst
+	37, // 39: NYql.NConnector.NApi.TSelect.TWhat.TItem.column:type_name -> Ydb.Column
+	37, // 40: NYql.NConnector.NApi.TReadSplitsResponse.TColumnSet.meta:type_name -> Ydb.Column
+	26, // 41: NYql.NConnector.NApi.TReadSplitsResponse.TColumnSet.data:type_name -> NYql.NConnector.NApi.TReadSplitsResponse.TColumnSet.TColumn
+	41, // 42: NYql.NConnector.NApi.TReadSplitsResponse.TColumnSet.TColumn.data:type_name -> Ydb.Value
+	17, // 43: NYql.NConnector.NApi.TPredicate.TNegation.operand:type_name -> NYql.NConnector.NApi.TPredicate
+	17, // 44: NYql.NConnector.NApi.TPredicate.TConjunction.operands:type_name -> NYql.NConnector.NApi.TPredicate
+	17, // 45: NYql.NConnector.NApi.TPredicate.TDisjunction.operands:type_name -> NYql.NConnector.NApi.TPredicate
+	16, // 46: NYql.NConnector.NApi.TPredicate.TBetween.value:type_name -> NYql.NConnector.NApi.TExpression
+	16, // 47: NYql.NConnector.NApi.TPredicate.TBetween.least:type_name -> NYql.NConnector.NApi.TExpression
+	16, // 48: NYql.NConnector.NApi.TPredicate.TBetween.greatest:type_name -> NYql.NConnector.NApi.TExpression
+	16, // 49: NYql.NConnector.NApi.TPredicate.TIn.value:type_name -> NYql.NConnector.NApi.TExpression
+	16, // 50: NYql.NConnector.NApi.TPredicate.TIn.set:type_name -> NYql.NConnector.NApi.TExpression
+	16, // 51: NYql.NConnector.NApi.TPredicate.TIsNull.value:type_name -> NYql.NConnector.NApi.TExpression
+	16, // 52: NYql.NConnector.NApi.TPredicate.TIsNotNull.value:type_name -> NYql.NConnector.NApi.TExpression
+	2,  // 53: NYql.NConnector.NApi.TPredicate.TComparison.operation:type_name -> NYql.NConnector.NApi.TPredicate.TComparison.EOperation
+	16, // 54: NYql.NConnector.NApi.TPredicate.TComparison.left_value:type_name -> NYql.NConnector.NApi.TExpression
+	16, // 55: NYql.NConnector.NApi.TPredicate.TComparison.right_value:type_name -> NYql.NConnector.NApi.TExpression
+	19, // 56: NYql.NConnector.NApi.TAst.TList.children:type_name -> NYql.NConnector.NApi.TAst
+	57, // [57:57] is the sub-list for method output_type
+	57, // [57:57] is the sub-list for method input_type
+	57, // [57:57] is the sub-list for extension type_name
+	57, // [57:57] is the sub-list for extension extendee
+	0,  // [0:57] is the sub-list for field type_name
 }
 
 func init() {
@@ -3106,7 +3070,7 @@ func file_ydb_library_yql_providers_generic_connector_api_service_protos_connect
 			}
 		}
 		file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TFilter); i {
+			switch v := v.(*TExpression); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3118,7 +3082,7 @@ func file_ydb_library_yql_providers_generic_connector_api_service_protos_connect
 			}
 		}
 		file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TError); i {
+			switch v := v.(*TPredicate); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3130,7 +3094,7 @@ func file_ydb_library_yql_providers_generic_connector_api_service_protos_connect
 			}
 		}
 		file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TAst); i {
+			switch v := v.(*TError); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3142,7 +3106,7 @@ func file_ydb_library_yql_providers_generic_connector_api_service_protos_connect
 			}
 		}
 		file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TSelect_TWhat); i {
+			switch v := v.(*TAst); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3154,7 +3118,7 @@ func file_ydb_library_yql_providers_generic_connector_api_service_protos_connect
 			}
 		}
 		file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TSelect_TFrom); i {
+			switch v := v.(*TSelect_TWhat); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3166,7 +3130,7 @@ func file_ydb_library_yql_providers_generic_connector_api_service_protos_connect
 			}
 		}
 		file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TSelect_TWhere); i {
+			switch v := v.(*TSelect_TFrom); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3178,7 +3142,7 @@ func file_ydb_library_yql_providers_generic_connector_api_service_protos_connect
 			}
 		}
 		file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TSelect_TLimit); i {
+			switch v := v.(*TSelect_TWhere); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3190,7 +3154,7 @@ func file_ydb_library_yql_providers_generic_connector_api_service_protos_connect
 			}
 		}
 		file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TSelect_TWhat_TItem); i {
+			switch v := v.(*TSelect_TLimit); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3202,7 +3166,7 @@ func file_ydb_library_yql_providers_generic_connector_api_service_protos_connect
 			}
 		}
 		file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TReadSplitsResponse_TColumnSet); i {
+			switch v := v.(*TSelect_TWhat_TItem); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3214,7 +3178,7 @@ func file_ydb_library_yql_providers_generic_connector_api_service_protos_connect
 			}
 		}
 		file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TReadSplitsResponse_TColumnSet_TColumn); i {
+			switch v := v.(*TReadSplitsResponse_TColumnSet); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3226,7 +3190,7 @@ func file_ydb_library_yql_providers_generic_connector_api_service_protos_connect
 			}
 		}
 		file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TFilter_TComparison); i {
+			switch v := v.(*TReadSplitsResponse_TColumnSet_TColumn); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3238,7 +3202,7 @@ func file_ydb_library_yql_providers_generic_connector_api_service_protos_connect
 			}
 		}
 		file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TFilter_TConjunction); i {
+			switch v := v.(*TPredicate_TNegation); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3250,7 +3214,7 @@ func file_ydb_library_yql_providers_generic_connector_api_service_protos_connect
 			}
 		}
 		file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TFilter_TDisjunction); i {
+			switch v := v.(*TPredicate_TConjunction); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3262,7 +3226,7 @@ func file_ydb_library_yql_providers_generic_connector_api_service_protos_connect
 			}
 		}
 		file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TFilter_TNegation); i {
+			switch v := v.(*TPredicate_TDisjunction); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3274,7 +3238,7 @@ func file_ydb_library_yql_providers_generic_connector_api_service_protos_connect
 			}
 		}
 		file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TFilter_TSubExpr); i {
+			switch v := v.(*TPredicate_TBetween); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3286,7 +3250,7 @@ func file_ydb_library_yql_providers_generic_connector_api_service_protos_connect
 			}
 		}
 		file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TFilter_TComparison_TBinary); i {
+			switch v := v.(*TPredicate_TIn); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3298,7 +3262,7 @@ func file_ydb_library_yql_providers_generic_connector_api_service_protos_connect
 			}
 		}
 		file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[29].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TFilter_TComparison_TIsNull); i {
+			switch v := v.(*TPredicate_TIsNull); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3310,7 +3274,7 @@ func file_ydb_library_yql_providers_generic_connector_api_service_protos_connect
 			}
 		}
 		file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[30].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TFilter_TComparison_TIsNotNull); i {
+			switch v := v.(*TPredicate_TIsNotNull); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3322,7 +3286,7 @@ func file_ydb_library_yql_providers_generic_connector_api_service_protos_connect
 			}
 		}
 		file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[31].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TFilter_TComparison_TIn); i {
+			switch v := v.(*TPredicate_TComparison); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3334,18 +3298,6 @@ func file_ydb_library_yql_providers_generic_connector_api_service_protos_connect
 			}
 		}
 		file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[32].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TFilter_TComparison_TBetween); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[33].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*TAst_TList); i {
 			case 0:
 				return &v.state
@@ -3372,37 +3324,33 @@ func file_ydb_library_yql_providers_generic_connector_api_service_protos_connect
 		(*TContinuation_Description)(nil),
 	}
 	file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[13].OneofWrappers = []interface{}{
-		(*TFilter_Comparison)(nil),
-		(*TFilter_Conjunction)(nil),
-		(*TFilter_Disjunction)(nil),
-		(*TFilter_Negation)(nil),
-		(*TFilter_SubExpr)(nil),
-	}
-	file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[15].OneofWrappers = []interface{}{
+		(*TExpression_TypedValue)(nil),
+		(*TExpression_Column)(nil),
+	}
+	file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[14].OneofWrappers = []interface{}{
+		(*TPredicate_Negation)(nil),
+		(*TPredicate_Conjunction)(nil),
+		(*TPredicate_Disjunction)(nil),
+		(*TPredicate_Between)(nil),
+		(*TPredicate_In)(nil),
+		(*TPredicate_IsNull)(nil),
+		(*TPredicate_IsNotNull)(nil),
+		(*TPredicate_Comparison)(nil),
+	}
+	file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[16].OneofWrappers = []interface{}{
 		(*TAst_Atom)(nil),
 		(*TAst_List)(nil),
 	}
-	file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[20].OneofWrappers = []interface{}{
+	file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[21].OneofWrappers = []interface{}{
 		(*TSelect_TWhat_TItem_Column)(nil),
 	}
-	file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[23].OneofWrappers = []interface{}{
-		(*TFilter_TComparison_Binary)(nil),
-		(*TFilter_TComparison_IsNull)(nil),
-		(*TFilter_TComparison_IsNotNull)(nil),
-		(*TFilter_TComparison_In)(nil),
-		(*TFilter_TComparison_Between)(nil),
-	}
-	file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_msgTypes[28].OneofWrappers = []interface{}{
-		(*TFilter_TComparison_TBinary_TypedValue)(nil),
-		(*TFilter_TComparison_TBinary_Column)(nil),
-	}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_ydb_library_yql_providers_generic_connector_api_service_protos_connector_proto_rawDesc,
 			NumEnums:      3,
-			NumMessages:   34,
+			NumMessages:   33,
 			NumExtensions: 0,
 			NumServices:   0,
 		},