From 70e9e40c7f3d0045050b900357cd2e3d8cdbdeda Mon Sep 17 00:00:00 2001
From: Evgenii Stratonikov <e.stratonikov@yadro.com>
Date: Thu, 22 Feb 2024 22:29:25 +0300
Subject: [PATCH] [#205] netmap: Add EC statement to placement policy

Signed-off-by: Evgenii Stratonikov <e.stratonikov@yadro.com>
---
 netmap/netmap.go                    |  26 +-
 netmap/parser/Query.g4              |   6 +-
 netmap/parser/Query.interp          | Bin 5170 -> 5562 bytes
 netmap/parser/Query.tokens          | Bin 372 -> 400 bytes
 netmap/parser/QueryLexer.g4         |   2 +
 netmap/parser/QueryLexer.interp     | Bin 7459 -> 7764 bytes
 netmap/parser/QueryLexer.tokens     | Bin 372 -> 400 bytes
 netmap/parser/query_base_visitor.go |   6 +-
 netmap/parser/query_lexer.go        | 242 +++++-----
 netmap/parser/query_parser.go       | 711 ++++++++++++++++++++--------
 netmap/parser/query_visitor.go      |   5 +-
 netmap/policy.go                    |  72 ++-
 netmap/policy_decode_test.go        |   2 +
 13 files changed, 728 insertions(+), 344 deletions(-)

diff --git a/netmap/netmap.go b/netmap/netmap.go
index 530b06d..f0ece7d 100644
--- a/netmap/netmap.go
+++ b/netmap/netmap.go
@@ -209,6 +209,25 @@ func (m NetMap) SelectFilterNodes(expr *SelectFilterExpr) ([][]NodeInfo, error)
 	return ret, nil
 }
 
+func countNodes(r netmap.Replica) uint32 {
+	if r.GetCount() != 0 {
+		return r.GetCount()
+	}
+	return r.GetECDataCount() + r.GetECParityCount()
+}
+
+func (p PlacementPolicy) isUnique() bool {
+	if p.unique {
+		return true
+	}
+	for _, r := range p.replicas {
+		if r.GetECDataCount() != 0 || r.GetECParityCount() != 0 {
+			return true
+		}
+	}
+	return false
+}
+
 // ContainerNodes returns two-dimensional list of nodes as a result of applying
 // given PlacementPolicy to the NetMap. Each line of the list corresponds to a
 // replica descriptor. Line order corresponds to order of ReplicaDescriptor list
@@ -230,6 +249,7 @@ func (m NetMap) ContainerNodes(p PlacementPolicy, pivot []byte) ([][]NodeInfo, e
 		return nil, err
 	}
 
+	unique := p.isUnique()
 	result := make([][]NodeInfo, len(p.replicas))
 
 	// Note that the cached selectors are not used when the policy contains the UNIQUE flag.
@@ -240,7 +260,7 @@ func (m NetMap) ContainerNodes(p PlacementPolicy, pivot []byte) ([][]NodeInfo, e
 		sName := p.replicas[i].GetSelector()
 		if sName == "" && !(len(p.replicas) == 1 && len(p.selectors) == 1) {
 			var s netmap.Selector
-			s.SetCount(p.replicas[i].GetCount())
+			s.SetCount(countNodes(p.replicas[i]))
 			s.SetFilter(mainFilterName)
 
 			nodes, err := c.getSelection(s)
@@ -250,14 +270,14 @@ func (m NetMap) ContainerNodes(p PlacementPolicy, pivot []byte) ([][]NodeInfo, e
 
 			result[i] = append(result[i], flattenNodes(nodes)...)
 
-			if p.unique {
+			if unique {
 				c.addUsedNodes(result[i]...)
 			}
 
 			continue
 		}
 
-		if p.unique {
+		if unique {
 			if c.processedSelectors[sName] == nil {
 				return nil, fmt.Errorf("selector not found: '%s'", sName)
 			}
diff --git a/netmap/parser/Query.g4 b/netmap/parser/Query.g4
index 72fa880..0a5b314 100644
--- a/netmap/parser/Query.g4
+++ b/netmap/parser/Query.g4
@@ -4,10 +4,14 @@ options {
     tokenVocab = QueryLexer;
 }
 
-policy: UNIQUE? repStmt+ cbfStmt? selectStmt* filterStmt* EOF;
+policy: UNIQUE? (repStmt | ecStmt)+ cbfStmt? selectStmt* filterStmt* EOF;
 
 selectFilterExpr: cbfStmt? selectStmt? filterStmt* EOF;
 
+ecStmt:
+    EC Data = NUMBER1 DOT Parity = NUMBER1 // erasure code configuration
+    (IN Selector = ident)?;                // optional selector name
+
 repStmt:
     REP Count = NUMBER1     // number of object replicas
     (IN Selector = ident)?; // optional selector name
diff --git a/netmap/parser/Query.interp b/netmap/parser/Query.interp
index a8fb219e6ebe10b7437f9f3f946010b562b52f2d..3f7a9ad50456f472f2f5103076fb7f55c6cfe1e3 100644
GIT binary patch
literal 5562
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

literal 5170
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
N{c>U5N-&6j{|Cx$s!jj^

diff --git a/netmap/parser/Query.tokens b/netmap/parser/Query.tokens
index 6376ea2554427a870ced03dce5ce8ad0847fdf62..b873682b36d215fd3270670b8b92f86b7f882279 100644
GIT binary patch
literal 400
zcmXw!%WA_g5JmU*N2cwfSc>yn3{<fvMPN&gBopYy|Nj@gCS-MwKsxB8+_t=^LrCKe
z9=Ys$K#lV<+0H%I6d$YU5ycig!3I4eCcPk3y<)iC)pe*g+0fKE+)JL-dEDdFtf)KS
z8K-dwWmMN=%)E5OFom_+R>N%SPVeIwYl~^uoH1=nD3;V+P~Lb&XzDw}(GtNSt@F)_
zQ}6L-C9CJpTZ!pceUE2Ve}tsmgo(mNVWH$A43t-uFiY4a3=<oKX%dq#PC^yt3H$iG
ugS-mKbnT5K+Fq4pD!({A<eNk5-bSMLoy8ON9~|mGIn@8~Pn36@1O5SRVp~7}

literal 372
zcmXxfv2Mg55CqVEe`J$X2Kz2|#Y*AKIzqzW09K?l{{O$oAj{PZvOMroZb#n4kW0Q7
zOS$wMsfKln+WSO%3O~Ebjf!q^r;y~6T$KmSuSK3zHR{~N478NIiZQf=*tCeT^c$j|
zUGZW@nxosR9@VWXX1b0()D}|z|3>lHT+t-vPUWh&3f~?Sye5<<rG0&AF=7Y$(~`v+
zs;z|dEf)7xu_JNHjiF+&7%0w#Vd4|QkT56=3x~weu&WFY1H=&VNy5ZH+)-#)J6Y&h
e{6Ju_W6&nz%YhT--w;@TM_~O6f%O4zG4v1kWL3xj

diff --git a/netmap/parser/QueryLexer.g4 b/netmap/parser/QueryLexer.g4
index c9b5ae6..3e4e924 100644
--- a/netmap/parser/QueryLexer.g4
+++ b/netmap/parser/QueryLexer.g4
@@ -7,6 +7,7 @@ SIMPLE_OP  : 'EQ' | 'NE' | 'GE' | 'GT' | 'LT' | 'LE';
 
 UNIQUE   : 'UNIQUE';
 REP      : 'REP';
+EC       : 'EC';
 IN       : 'IN';
 AS       : 'AS';
 CBF      : 'CBF';
@@ -14,6 +15,7 @@ SELECT   : 'SELECT';
 FROM     : 'FROM';
 FILTER   : 'FILTER';
 WILDCARD : '*';
+DOT      : '.';
 
 CLAUSE_SAME     : 'SAME';
 CLAUSE_DISTINCT : 'DISTINCT';
diff --git a/netmap/parser/QueryLexer.interp b/netmap/parser/QueryLexer.interp
index 95db14431c9a18ee3d040fb153ab75a3adaa9e06..c4d6296169c9c6597d93f91b4434f5f53d4bc303 100644
GIT binary patch
literal 7764
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
Z4%s#4H->`lN5YQ*ez4;b?HG+8{svh1Zi@f_

literal 7459
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

diff --git a/netmap/parser/QueryLexer.tokens b/netmap/parser/QueryLexer.tokens
index 6376ea2554427a870ced03dce5ce8ad0847fdf62..b873682b36d215fd3270670b8b92f86b7f882279 100644
GIT binary patch
literal 400
zcmXw!%WA_g5JmU*N2cwfSc>yn3{<fvMPN&gBopYy|Nj@gCS-MwKsxB8+_t=^LrCKe
z9=Ys$K#lV<+0H%I6d$YU5ycig!3I4eCcPk3y<)iC)pe*g+0fKE+)JL-dEDdFtf)KS
z8K-dwWmMN=%)E5OFom_+R>N%SPVeIwYl~^uoH1=nD3;V+P~Lb&XzDw}(GtNSt@F)_
zQ}6L-C9CJpTZ!pceUE2Ve}tsmgo(mNVWH$A43t-uFiY4a3=<oKX%dq#PC^yt3H$iG
ugS-mKbnT5K+Fq4pD!({A<eNk5-bSMLoy8ON9~|mGIn@8~Pn36@1O5SRVp~7}

literal 372
zcmXxfv2Mg55CqVEe`J$X2Kz2|#Y*AKIzqzW09K?l{{O$oAj{PZvOMroZb#n4kW0Q7
zOS$wMsfKln+WSO%3O~Ebjf!q^r;y~6T$KmSuSK3zHR{~N478NIiZQf=*tCeT^c$j|
zUGZW@nxosR9@VWXX1b0()D}|z|3>lHT+t-vPUWh&3f~?Sye5<<rG0&AF=7Y$(~`v+
zs;z|dEf)7xu_JNHjiF+&7%0w#Vd4|QkT56=3x~weu&WFY1H=&VNy5ZH+)-#)J6Y&h
e{6Ju_W6&nz%YhT--w;@TM_~O6f%O4zG4v1kWL3xj

diff --git a/netmap/parser/query_base_visitor.go b/netmap/parser/query_base_visitor.go
index 981106f..5816dfe 100644
--- a/netmap/parser/query_base_visitor.go
+++ b/netmap/parser/query_base_visitor.go
@@ -1,4 +1,4 @@
-// Code generated from Query.g4 by ANTLR 4.13.0. DO NOT EDIT.
+// Code generated from /repo/frostfs/sdk-go/netmap/parser/Query.g4 by ANTLR 4.13.0. DO NOT EDIT.
 
 package parser // Query
 
@@ -16,6 +16,10 @@ func (v *BaseQueryVisitor) VisitSelectFilterExpr(ctx *SelectFilterExprContext) i
 	return v.VisitChildren(ctx)
 }
 
+func (v *BaseQueryVisitor) VisitEcStmt(ctx *EcStmtContext) interface{} {
+	return v.VisitChildren(ctx)
+}
+
 func (v *BaseQueryVisitor) VisitRepStmt(ctx *RepStmtContext) interface{} {
 	return v.VisitChildren(ctx)
 }
diff --git a/netmap/parser/query_lexer.go b/netmap/parser/query_lexer.go
index c1ae141..85a0336 100644
--- a/netmap/parser/query_lexer.go
+++ b/netmap/parser/query_lexer.go
@@ -1,4 +1,4 @@
-// Code generated from QueryLexer.g4 by ANTLR 4.13.0. DO NOT EDIT.
+// Code generated from /repo/frostfs/sdk-go/netmap/parser/QueryLexer.g4 by ANTLR 4.13.0. DO NOT EDIT.
 
 package parser
 
@@ -43,119 +43,123 @@ func querylexerLexerInit() {
 		"DEFAULT_MODE",
 	}
 	staticData.LiteralNames = []string{
-		"", "'NOT'", "'AND'", "'OR'", "", "'UNIQUE'", "'REP'", "'IN'", "'AS'",
-		"'CBF'", "'SELECT'", "'FROM'", "'FILTER'", "'*'", "'SAME'", "'DISTINCT'",
-		"'('", "')'", "'@'", "", "", "'0'",
+		"", "'NOT'", "'AND'", "'OR'", "", "'UNIQUE'", "'REP'", "'EC'", "'IN'",
+		"'AS'", "'CBF'", "'SELECT'", "'FROM'", "'FILTER'", "'*'", "'.'", "'SAME'",
+		"'DISTINCT'", "'('", "')'", "'@'", "", "", "'0'",
 	}
 	staticData.SymbolicNames = []string{
-		"", "NOT_OP", "AND_OP", "OR_OP", "SIMPLE_OP", "UNIQUE", "REP", "IN",
-		"AS", "CBF", "SELECT", "FROM", "FILTER", "WILDCARD", "CLAUSE_SAME",
+		"", "NOT_OP", "AND_OP", "OR_OP", "SIMPLE_OP", "UNIQUE", "REP", "EC",
+		"IN", "AS", "CBF", "SELECT", "FROM", "FILTER", "WILDCARD", "DOT", "CLAUSE_SAME",
 		"CLAUSE_DISTINCT", "L_PAREN", "R_PAREN", "AT", "IDENT", "NUMBER1", "ZERO",
 		"STRING", "WS",
 	}
 	staticData.RuleNames = []string{
-		"NOT_OP", "AND_OP", "OR_OP", "SIMPLE_OP", "UNIQUE", "REP", "IN", "AS",
-		"CBF", "SELECT", "FROM", "FILTER", "WILDCARD", "CLAUSE_SAME", "CLAUSE_DISTINCT",
-		"L_PAREN", "R_PAREN", "AT", "IDENT", "Digit", "Nondigit", "NUMBER1",
-		"ZERO", "STRING", "ESC", "UNICODE", "HEX", "SAFECODEPOINTSINGLE", "SAFECODEPOINTDOUBLE",
-		"WS",
+		"NOT_OP", "AND_OP", "OR_OP", "SIMPLE_OP", "UNIQUE", "REP", "EC", "IN",
+		"AS", "CBF", "SELECT", "FROM", "FILTER", "WILDCARD", "DOT", "CLAUSE_SAME",
+		"CLAUSE_DISTINCT", "L_PAREN", "R_PAREN", "AT", "IDENT", "Digit", "Nondigit",
+		"NUMBER1", "ZERO", "STRING", "ESC", "UNICODE", "HEX", "SAFECODEPOINTSINGLE",
+		"SAFECODEPOINTDOUBLE", "WS",
 	}
 	staticData.PredictionContextCache = antlr.NewPredictionContextCache()
 	staticData.serializedATN = []int32{
-		4, 0, 23, 213, 6, -1, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2,
+		4, 0, 25, 222, 6, -1, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2,
 		4, 7, 4, 2, 5, 7, 5, 2, 6, 7, 6, 2, 7, 7, 7, 2, 8, 7, 8, 2, 9, 7, 9, 2,
 		10, 7, 10, 2, 11, 7, 11, 2, 12, 7, 12, 2, 13, 7, 13, 2, 14, 7, 14, 2, 15,
 		7, 15, 2, 16, 7, 16, 2, 17, 7, 17, 2, 18, 7, 18, 2, 19, 7, 19, 2, 20, 7,
 		20, 2, 21, 7, 21, 2, 22, 7, 22, 2, 23, 7, 23, 2, 24, 7, 24, 2, 25, 7, 25,
-		2, 26, 7, 26, 2, 27, 7, 27, 2, 28, 7, 28, 2, 29, 7, 29, 1, 0, 1, 0, 1,
-		0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 2, 1, 2, 1, 3, 1, 3, 1, 3, 1,
-		3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 3, 3, 85, 8, 3, 1, 4,
-		1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 5, 1, 5, 1, 5, 1, 5, 1, 6, 1, 6,
-		1, 6, 1, 7, 1, 7, 1, 7, 1, 8, 1, 8, 1, 8, 1, 8, 1, 9, 1, 9, 1, 9, 1, 9,
-		1, 9, 1, 9, 1, 9, 1, 10, 1, 10, 1, 10, 1, 10, 1, 10, 1, 11, 1, 11, 1, 11,
-		1, 11, 1, 11, 1, 11, 1, 11, 1, 12, 1, 12, 1, 13, 1, 13, 1, 13, 1, 13, 1,
-		13, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 15,
-		1, 15, 1, 16, 1, 16, 1, 17, 1, 17, 1, 18, 1, 18, 1, 18, 5, 18, 152, 8,
-		18, 10, 18, 12, 18, 155, 9, 18, 1, 19, 1, 19, 1, 20, 1, 20, 1, 21, 1, 21,
-		5, 21, 163, 8, 21, 10, 21, 12, 21, 166, 9, 21, 1, 22, 1, 22, 1, 23, 1,
-		23, 1, 23, 5, 23, 173, 8, 23, 10, 23, 12, 23, 176, 9, 23, 1, 23, 1, 23,
-		1, 23, 1, 23, 5, 23, 182, 8, 23, 10, 23, 12, 23, 185, 9, 23, 1, 23, 3,
-		23, 188, 8, 23, 1, 24, 1, 24, 1, 24, 3, 24, 193, 8, 24, 1, 25, 1, 25, 1,
-		25, 1, 25, 1, 25, 1, 25, 1, 26, 1, 26, 1, 27, 1, 27, 1, 28, 1, 28, 1, 29,
-		4, 29, 208, 8, 29, 11, 29, 12, 29, 209, 1, 29, 1, 29, 0, 0, 30, 1, 1, 3,
-		2, 5, 3, 7, 4, 9, 5, 11, 6, 13, 7, 15, 8, 17, 9, 19, 10, 21, 11, 23, 12,
-		25, 13, 27, 14, 29, 15, 31, 16, 33, 17, 35, 18, 37, 19, 39, 0, 41, 0, 43,
-		20, 45, 21, 47, 22, 49, 0, 51, 0, 53, 0, 55, 0, 57, 0, 59, 23, 1, 0, 8,
-		1, 0, 48, 57, 3, 0, 65, 90, 95, 95, 97, 122, 1, 0, 49, 57, 9, 0, 34, 34,
-		39, 39, 47, 47, 92, 92, 98, 98, 102, 102, 110, 110, 114, 114, 116, 116,
-		3, 0, 48, 57, 65, 70, 97, 102, 3, 0, 0, 31, 39, 39, 92, 92, 3, 0, 0, 31,
-		34, 34, 92, 92, 3, 0, 9, 10, 13, 13, 32, 32, 220, 0, 1, 1, 0, 0, 0, 0,
-		3, 1, 0, 0, 0, 0, 5, 1, 0, 0, 0, 0, 7, 1, 0, 0, 0, 0, 9, 1, 0, 0, 0, 0,
-		11, 1, 0, 0, 0, 0, 13, 1, 0, 0, 0, 0, 15, 1, 0, 0, 0, 0, 17, 1, 0, 0, 0,
-		0, 19, 1, 0, 0, 0, 0, 21, 1, 0, 0, 0, 0, 23, 1, 0, 0, 0, 0, 25, 1, 0, 0,
-		0, 0, 27, 1, 0, 0, 0, 0, 29, 1, 0, 0, 0, 0, 31, 1, 0, 0, 0, 0, 33, 1, 0,
-		0, 0, 0, 35, 1, 0, 0, 0, 0, 37, 1, 0, 0, 0, 0, 43, 1, 0, 0, 0, 0, 45, 1,
-		0, 0, 0, 0, 47, 1, 0, 0, 0, 0, 59, 1, 0, 0, 0, 1, 61, 1, 0, 0, 0, 3, 65,
-		1, 0, 0, 0, 5, 69, 1, 0, 0, 0, 7, 84, 1, 0, 0, 0, 9, 86, 1, 0, 0, 0, 11,
-		93, 1, 0, 0, 0, 13, 97, 1, 0, 0, 0, 15, 100, 1, 0, 0, 0, 17, 103, 1, 0,
-		0, 0, 19, 107, 1, 0, 0, 0, 21, 114, 1, 0, 0, 0, 23, 119, 1, 0, 0, 0, 25,
-		126, 1, 0, 0, 0, 27, 128, 1, 0, 0, 0, 29, 133, 1, 0, 0, 0, 31, 142, 1,
-		0, 0, 0, 33, 144, 1, 0, 0, 0, 35, 146, 1, 0, 0, 0, 37, 148, 1, 0, 0, 0,
-		39, 156, 1, 0, 0, 0, 41, 158, 1, 0, 0, 0, 43, 160, 1, 0, 0, 0, 45, 167,
-		1, 0, 0, 0, 47, 187, 1, 0, 0, 0, 49, 189, 1, 0, 0, 0, 51, 194, 1, 0, 0,
-		0, 53, 200, 1, 0, 0, 0, 55, 202, 1, 0, 0, 0, 57, 204, 1, 0, 0, 0, 59, 207,
-		1, 0, 0, 0, 61, 62, 5, 78, 0, 0, 62, 63, 5, 79, 0, 0, 63, 64, 5, 84, 0,
-		0, 64, 2, 1, 0, 0, 0, 65, 66, 5, 65, 0, 0, 66, 67, 5, 78, 0, 0, 67, 68,
-		5, 68, 0, 0, 68, 4, 1, 0, 0, 0, 69, 70, 5, 79, 0, 0, 70, 71, 5, 82, 0,
-		0, 71, 6, 1, 0, 0, 0, 72, 73, 5, 69, 0, 0, 73, 85, 5, 81, 0, 0, 74, 75,
-		5, 78, 0, 0, 75, 85, 5, 69, 0, 0, 76, 77, 5, 71, 0, 0, 77, 85, 5, 69, 0,
-		0, 78, 79, 5, 71, 0, 0, 79, 85, 5, 84, 0, 0, 80, 81, 5, 76, 0, 0, 81, 85,
-		5, 84, 0, 0, 82, 83, 5, 76, 0, 0, 83, 85, 5, 69, 0, 0, 84, 72, 1, 0, 0,
-		0, 84, 74, 1, 0, 0, 0, 84, 76, 1, 0, 0, 0, 84, 78, 1, 0, 0, 0, 84, 80,
-		1, 0, 0, 0, 84, 82, 1, 0, 0, 0, 85, 8, 1, 0, 0, 0, 86, 87, 5, 85, 0, 0,
-		87, 88, 5, 78, 0, 0, 88, 89, 5, 73, 0, 0, 89, 90, 5, 81, 0, 0, 90, 91,
-		5, 85, 0, 0, 91, 92, 5, 69, 0, 0, 92, 10, 1, 0, 0, 0, 93, 94, 5, 82, 0,
-		0, 94, 95, 5, 69, 0, 0, 95, 96, 5, 80, 0, 0, 96, 12, 1, 0, 0, 0, 97, 98,
-		5, 73, 0, 0, 98, 99, 5, 78, 0, 0, 99, 14, 1, 0, 0, 0, 100, 101, 5, 65,
-		0, 0, 101, 102, 5, 83, 0, 0, 102, 16, 1, 0, 0, 0, 103, 104, 5, 67, 0, 0,
-		104, 105, 5, 66, 0, 0, 105, 106, 5, 70, 0, 0, 106, 18, 1, 0, 0, 0, 107,
-		108, 5, 83, 0, 0, 108, 109, 5, 69, 0, 0, 109, 110, 5, 76, 0, 0, 110, 111,
-		5, 69, 0, 0, 111, 112, 5, 67, 0, 0, 112, 113, 5, 84, 0, 0, 113, 20, 1,
-		0, 0, 0, 114, 115, 5, 70, 0, 0, 115, 116, 5, 82, 0, 0, 116, 117, 5, 79,
-		0, 0, 117, 118, 5, 77, 0, 0, 118, 22, 1, 0, 0, 0, 119, 120, 5, 70, 0, 0,
-		120, 121, 5, 73, 0, 0, 121, 122, 5, 76, 0, 0, 122, 123, 5, 84, 0, 0, 123,
-		124, 5, 69, 0, 0, 124, 125, 5, 82, 0, 0, 125, 24, 1, 0, 0, 0, 126, 127,
-		5, 42, 0, 0, 127, 26, 1, 0, 0, 0, 128, 129, 5, 83, 0, 0, 129, 130, 5, 65,
-		0, 0, 130, 131, 5, 77, 0, 0, 131, 132, 5, 69, 0, 0, 132, 28, 1, 0, 0, 0,
-		133, 134, 5, 68, 0, 0, 134, 135, 5, 73, 0, 0, 135, 136, 5, 83, 0, 0, 136,
-		137, 5, 84, 0, 0, 137, 138, 5, 73, 0, 0, 138, 139, 5, 78, 0, 0, 139, 140,
-		5, 67, 0, 0, 140, 141, 5, 84, 0, 0, 141, 30, 1, 0, 0, 0, 142, 143, 5, 40,
-		0, 0, 143, 32, 1, 0, 0, 0, 144, 145, 5, 41, 0, 0, 145, 34, 1, 0, 0, 0,
-		146, 147, 5, 64, 0, 0, 147, 36, 1, 0, 0, 0, 148, 153, 3, 41, 20, 0, 149,
-		152, 3, 39, 19, 0, 150, 152, 3, 41, 20, 0, 151, 149, 1, 0, 0, 0, 151, 150,
-		1, 0, 0, 0, 152, 155, 1, 0, 0, 0, 153, 151, 1, 0, 0, 0, 153, 154, 1, 0,
-		0, 0, 154, 38, 1, 0, 0, 0, 155, 153, 1, 0, 0, 0, 156, 157, 7, 0, 0, 0,
-		157, 40, 1, 0, 0, 0, 158, 159, 7, 1, 0, 0, 159, 42, 1, 0, 0, 0, 160, 164,
-		7, 2, 0, 0, 161, 163, 3, 39, 19, 0, 162, 161, 1, 0, 0, 0, 163, 166, 1,
-		0, 0, 0, 164, 162, 1, 0, 0, 0, 164, 165, 1, 0, 0, 0, 165, 44, 1, 0, 0,
-		0, 166, 164, 1, 0, 0, 0, 167, 168, 5, 48, 0, 0, 168, 46, 1, 0, 0, 0, 169,
-		174, 5, 34, 0, 0, 170, 173, 3, 49, 24, 0, 171, 173, 3, 57, 28, 0, 172,
-		170, 1, 0, 0, 0, 172, 171, 1, 0, 0, 0, 173, 176, 1, 0, 0, 0, 174, 172,
-		1, 0, 0, 0, 174, 175, 1, 0, 0, 0, 175, 177, 1, 0, 0, 0, 176, 174, 1, 0,
-		0, 0, 177, 188, 5, 34, 0, 0, 178, 183, 5, 39, 0, 0, 179, 182, 3, 49, 24,
-		0, 180, 182, 3, 55, 27, 0, 181, 179, 1, 0, 0, 0, 181, 180, 1, 0, 0, 0,
-		182, 185, 1, 0, 0, 0, 183, 181, 1, 0, 0, 0, 183, 184, 1, 0, 0, 0, 184,
-		186, 1, 0, 0, 0, 185, 183, 1, 0, 0, 0, 186, 188, 5, 39, 0, 0, 187, 169,
-		1, 0, 0, 0, 187, 178, 1, 0, 0, 0, 188, 48, 1, 0, 0, 0, 189, 192, 5, 92,
-		0, 0, 190, 193, 7, 3, 0, 0, 191, 193, 3, 51, 25, 0, 192, 190, 1, 0, 0,
-		0, 192, 191, 1, 0, 0, 0, 193, 50, 1, 0, 0, 0, 194, 195, 5, 117, 0, 0, 195,
-		196, 3, 53, 26, 0, 196, 197, 3, 53, 26, 0, 197, 198, 3, 53, 26, 0, 198,
-		199, 3, 53, 26, 0, 199, 52, 1, 0, 0, 0, 200, 201, 7, 4, 0, 0, 201, 54,
-		1, 0, 0, 0, 202, 203, 8, 5, 0, 0, 203, 56, 1, 0, 0, 0, 204, 205, 8, 6,
-		0, 0, 205, 58, 1, 0, 0, 0, 206, 208, 7, 7, 0, 0, 207, 206, 1, 0, 0, 0,
-		208, 209, 1, 0, 0, 0, 209, 207, 1, 0, 0, 0, 209, 210, 1, 0, 0, 0, 210,
-		211, 1, 0, 0, 0, 211, 212, 6, 29, 0, 0, 212, 60, 1, 0, 0, 0, 12, 0, 84,
-		151, 153, 164, 172, 174, 181, 183, 187, 192, 209, 1, 6, 0, 0,
+		2, 26, 7, 26, 2, 27, 7, 27, 2, 28, 7, 28, 2, 29, 7, 29, 2, 30, 7, 30, 2,
+		31, 7, 31, 1, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 2,
+		1, 2, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3,
+		1, 3, 3, 3, 89, 8, 3, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 5, 1,
+		5, 1, 5, 1, 5, 1, 6, 1, 6, 1, 6, 1, 7, 1, 7, 1, 7, 1, 8, 1, 8, 1, 8, 1,
+		9, 1, 9, 1, 9, 1, 9, 1, 10, 1, 10, 1, 10, 1, 10, 1, 10, 1, 10, 1, 10, 1,
+		11, 1, 11, 1, 11, 1, 11, 1, 11, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12,
+		1, 12, 1, 13, 1, 13, 1, 14, 1, 14, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1,
+		16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 17, 1, 17,
+		1, 18, 1, 18, 1, 19, 1, 19, 1, 20, 1, 20, 1, 20, 5, 20, 161, 8, 20, 10,
+		20, 12, 20, 164, 9, 20, 1, 21, 1, 21, 1, 22, 1, 22, 1, 23, 1, 23, 5, 23,
+		172, 8, 23, 10, 23, 12, 23, 175, 9, 23, 1, 24, 1, 24, 1, 25, 1, 25, 1,
+		25, 5, 25, 182, 8, 25, 10, 25, 12, 25, 185, 9, 25, 1, 25, 1, 25, 1, 25,
+		1, 25, 5, 25, 191, 8, 25, 10, 25, 12, 25, 194, 9, 25, 1, 25, 3, 25, 197,
+		8, 25, 1, 26, 1, 26, 1, 26, 3, 26, 202, 8, 26, 1, 27, 1, 27, 1, 27, 1,
+		27, 1, 27, 1, 27, 1, 28, 1, 28, 1, 29, 1, 29, 1, 30, 1, 30, 1, 31, 4, 31,
+		217, 8, 31, 11, 31, 12, 31, 218, 1, 31, 1, 31, 0, 0, 32, 1, 1, 3, 2, 5,
+		3, 7, 4, 9, 5, 11, 6, 13, 7, 15, 8, 17, 9, 19, 10, 21, 11, 23, 12, 25,
+		13, 27, 14, 29, 15, 31, 16, 33, 17, 35, 18, 37, 19, 39, 20, 41, 21, 43,
+		0, 45, 0, 47, 22, 49, 23, 51, 24, 53, 0, 55, 0, 57, 0, 59, 0, 61, 0, 63,
+		25, 1, 0, 8, 1, 0, 48, 57, 3, 0, 65, 90, 95, 95, 97, 122, 1, 0, 49, 57,
+		9, 0, 34, 34, 39, 39, 47, 47, 92, 92, 98, 98, 102, 102, 110, 110, 114,
+		114, 116, 116, 3, 0, 48, 57, 65, 70, 97, 102, 3, 0, 0, 31, 39, 39, 92,
+		92, 3, 0, 0, 31, 34, 34, 92, 92, 3, 0, 9, 10, 13, 13, 32, 32, 229, 0, 1,
+		1, 0, 0, 0, 0, 3, 1, 0, 0, 0, 0, 5, 1, 0, 0, 0, 0, 7, 1, 0, 0, 0, 0, 9,
+		1, 0, 0, 0, 0, 11, 1, 0, 0, 0, 0, 13, 1, 0, 0, 0, 0, 15, 1, 0, 0, 0, 0,
+		17, 1, 0, 0, 0, 0, 19, 1, 0, 0, 0, 0, 21, 1, 0, 0, 0, 0, 23, 1, 0, 0, 0,
+		0, 25, 1, 0, 0, 0, 0, 27, 1, 0, 0, 0, 0, 29, 1, 0, 0, 0, 0, 31, 1, 0, 0,
+		0, 0, 33, 1, 0, 0, 0, 0, 35, 1, 0, 0, 0, 0, 37, 1, 0, 0, 0, 0, 39, 1, 0,
+		0, 0, 0, 41, 1, 0, 0, 0, 0, 47, 1, 0, 0, 0, 0, 49, 1, 0, 0, 0, 0, 51, 1,
+		0, 0, 0, 0, 63, 1, 0, 0, 0, 1, 65, 1, 0, 0, 0, 3, 69, 1, 0, 0, 0, 5, 73,
+		1, 0, 0, 0, 7, 88, 1, 0, 0, 0, 9, 90, 1, 0, 0, 0, 11, 97, 1, 0, 0, 0, 13,
+		101, 1, 0, 0, 0, 15, 104, 1, 0, 0, 0, 17, 107, 1, 0, 0, 0, 19, 110, 1,
+		0, 0, 0, 21, 114, 1, 0, 0, 0, 23, 121, 1, 0, 0, 0, 25, 126, 1, 0, 0, 0,
+		27, 133, 1, 0, 0, 0, 29, 135, 1, 0, 0, 0, 31, 137, 1, 0, 0, 0, 33, 142,
+		1, 0, 0, 0, 35, 151, 1, 0, 0, 0, 37, 153, 1, 0, 0, 0, 39, 155, 1, 0, 0,
+		0, 41, 157, 1, 0, 0, 0, 43, 165, 1, 0, 0, 0, 45, 167, 1, 0, 0, 0, 47, 169,
+		1, 0, 0, 0, 49, 176, 1, 0, 0, 0, 51, 196, 1, 0, 0, 0, 53, 198, 1, 0, 0,
+		0, 55, 203, 1, 0, 0, 0, 57, 209, 1, 0, 0, 0, 59, 211, 1, 0, 0, 0, 61, 213,
+		1, 0, 0, 0, 63, 216, 1, 0, 0, 0, 65, 66, 5, 78, 0, 0, 66, 67, 5, 79, 0,
+		0, 67, 68, 5, 84, 0, 0, 68, 2, 1, 0, 0, 0, 69, 70, 5, 65, 0, 0, 70, 71,
+		5, 78, 0, 0, 71, 72, 5, 68, 0, 0, 72, 4, 1, 0, 0, 0, 73, 74, 5, 79, 0,
+		0, 74, 75, 5, 82, 0, 0, 75, 6, 1, 0, 0, 0, 76, 77, 5, 69, 0, 0, 77, 89,
+		5, 81, 0, 0, 78, 79, 5, 78, 0, 0, 79, 89, 5, 69, 0, 0, 80, 81, 5, 71, 0,
+		0, 81, 89, 5, 69, 0, 0, 82, 83, 5, 71, 0, 0, 83, 89, 5, 84, 0, 0, 84, 85,
+		5, 76, 0, 0, 85, 89, 5, 84, 0, 0, 86, 87, 5, 76, 0, 0, 87, 89, 5, 69, 0,
+		0, 88, 76, 1, 0, 0, 0, 88, 78, 1, 0, 0, 0, 88, 80, 1, 0, 0, 0, 88, 82,
+		1, 0, 0, 0, 88, 84, 1, 0, 0, 0, 88, 86, 1, 0, 0, 0, 89, 8, 1, 0, 0, 0,
+		90, 91, 5, 85, 0, 0, 91, 92, 5, 78, 0, 0, 92, 93, 5, 73, 0, 0, 93, 94,
+		5, 81, 0, 0, 94, 95, 5, 85, 0, 0, 95, 96, 5, 69, 0, 0, 96, 10, 1, 0, 0,
+		0, 97, 98, 5, 82, 0, 0, 98, 99, 5, 69, 0, 0, 99, 100, 5, 80, 0, 0, 100,
+		12, 1, 0, 0, 0, 101, 102, 5, 69, 0, 0, 102, 103, 5, 67, 0, 0, 103, 14,
+		1, 0, 0, 0, 104, 105, 5, 73, 0, 0, 105, 106, 5, 78, 0, 0, 106, 16, 1, 0,
+		0, 0, 107, 108, 5, 65, 0, 0, 108, 109, 5, 83, 0, 0, 109, 18, 1, 0, 0, 0,
+		110, 111, 5, 67, 0, 0, 111, 112, 5, 66, 0, 0, 112, 113, 5, 70, 0, 0, 113,
+		20, 1, 0, 0, 0, 114, 115, 5, 83, 0, 0, 115, 116, 5, 69, 0, 0, 116, 117,
+		5, 76, 0, 0, 117, 118, 5, 69, 0, 0, 118, 119, 5, 67, 0, 0, 119, 120, 5,
+		84, 0, 0, 120, 22, 1, 0, 0, 0, 121, 122, 5, 70, 0, 0, 122, 123, 5, 82,
+		0, 0, 123, 124, 5, 79, 0, 0, 124, 125, 5, 77, 0, 0, 125, 24, 1, 0, 0, 0,
+		126, 127, 5, 70, 0, 0, 127, 128, 5, 73, 0, 0, 128, 129, 5, 76, 0, 0, 129,
+		130, 5, 84, 0, 0, 130, 131, 5, 69, 0, 0, 131, 132, 5, 82, 0, 0, 132, 26,
+		1, 0, 0, 0, 133, 134, 5, 42, 0, 0, 134, 28, 1, 0, 0, 0, 135, 136, 5, 46,
+		0, 0, 136, 30, 1, 0, 0, 0, 137, 138, 5, 83, 0, 0, 138, 139, 5, 65, 0, 0,
+		139, 140, 5, 77, 0, 0, 140, 141, 5, 69, 0, 0, 141, 32, 1, 0, 0, 0, 142,
+		143, 5, 68, 0, 0, 143, 144, 5, 73, 0, 0, 144, 145, 5, 83, 0, 0, 145, 146,
+		5, 84, 0, 0, 146, 147, 5, 73, 0, 0, 147, 148, 5, 78, 0, 0, 148, 149, 5,
+		67, 0, 0, 149, 150, 5, 84, 0, 0, 150, 34, 1, 0, 0, 0, 151, 152, 5, 40,
+		0, 0, 152, 36, 1, 0, 0, 0, 153, 154, 5, 41, 0, 0, 154, 38, 1, 0, 0, 0,
+		155, 156, 5, 64, 0, 0, 156, 40, 1, 0, 0, 0, 157, 162, 3, 45, 22, 0, 158,
+		161, 3, 43, 21, 0, 159, 161, 3, 45, 22, 0, 160, 158, 1, 0, 0, 0, 160, 159,
+		1, 0, 0, 0, 161, 164, 1, 0, 0, 0, 162, 160, 1, 0, 0, 0, 162, 163, 1, 0,
+		0, 0, 163, 42, 1, 0, 0, 0, 164, 162, 1, 0, 0, 0, 165, 166, 7, 0, 0, 0,
+		166, 44, 1, 0, 0, 0, 167, 168, 7, 1, 0, 0, 168, 46, 1, 0, 0, 0, 169, 173,
+		7, 2, 0, 0, 170, 172, 3, 43, 21, 0, 171, 170, 1, 0, 0, 0, 172, 175, 1,
+		0, 0, 0, 173, 171, 1, 0, 0, 0, 173, 174, 1, 0, 0, 0, 174, 48, 1, 0, 0,
+		0, 175, 173, 1, 0, 0, 0, 176, 177, 5, 48, 0, 0, 177, 50, 1, 0, 0, 0, 178,
+		183, 5, 34, 0, 0, 179, 182, 3, 53, 26, 0, 180, 182, 3, 61, 30, 0, 181,
+		179, 1, 0, 0, 0, 181, 180, 1, 0, 0, 0, 182, 185, 1, 0, 0, 0, 183, 181,
+		1, 0, 0, 0, 183, 184, 1, 0, 0, 0, 184, 186, 1, 0, 0, 0, 185, 183, 1, 0,
+		0, 0, 186, 197, 5, 34, 0, 0, 187, 192, 5, 39, 0, 0, 188, 191, 3, 53, 26,
+		0, 189, 191, 3, 59, 29, 0, 190, 188, 1, 0, 0, 0, 190, 189, 1, 0, 0, 0,
+		191, 194, 1, 0, 0, 0, 192, 190, 1, 0, 0, 0, 192, 193, 1, 0, 0, 0, 193,
+		195, 1, 0, 0, 0, 194, 192, 1, 0, 0, 0, 195, 197, 5, 39, 0, 0, 196, 178,
+		1, 0, 0, 0, 196, 187, 1, 0, 0, 0, 197, 52, 1, 0, 0, 0, 198, 201, 5, 92,
+		0, 0, 199, 202, 7, 3, 0, 0, 200, 202, 3, 55, 27, 0, 201, 199, 1, 0, 0,
+		0, 201, 200, 1, 0, 0, 0, 202, 54, 1, 0, 0, 0, 203, 204, 5, 117, 0, 0, 204,
+		205, 3, 57, 28, 0, 205, 206, 3, 57, 28, 0, 206, 207, 3, 57, 28, 0, 207,
+		208, 3, 57, 28, 0, 208, 56, 1, 0, 0, 0, 209, 210, 7, 4, 0, 0, 210, 58,
+		1, 0, 0, 0, 211, 212, 8, 5, 0, 0, 212, 60, 1, 0, 0, 0, 213, 214, 8, 6,
+		0, 0, 214, 62, 1, 0, 0, 0, 215, 217, 7, 7, 0, 0, 216, 215, 1, 0, 0, 0,
+		217, 218, 1, 0, 0, 0, 218, 216, 1, 0, 0, 0, 218, 219, 1, 0, 0, 0, 219,
+		220, 1, 0, 0, 0, 220, 221, 6, 31, 0, 0, 221, 64, 1, 0, 0, 0, 12, 0, 88,
+		160, 162, 173, 181, 183, 190, 192, 196, 201, 218, 1, 6, 0, 0,
 	}
 	deserializer := antlr.NewATNDeserializer(nil)
 	staticData.atn = deserializer.Deserialize(staticData.serializedATN)
@@ -202,21 +206,23 @@ const (
 	QueryLexerSIMPLE_OP       = 4
 	QueryLexerUNIQUE          = 5
 	QueryLexerREP             = 6
-	QueryLexerIN              = 7
-	QueryLexerAS              = 8
-	QueryLexerCBF             = 9
-	QueryLexerSELECT          = 10
-	QueryLexerFROM            = 11
-	QueryLexerFILTER          = 12
-	QueryLexerWILDCARD        = 13
-	QueryLexerCLAUSE_SAME     = 14
-	QueryLexerCLAUSE_DISTINCT = 15
-	QueryLexerL_PAREN         = 16
-	QueryLexerR_PAREN         = 17
-	QueryLexerAT              = 18
-	QueryLexerIDENT           = 19
-	QueryLexerNUMBER1         = 20
-	QueryLexerZERO            = 21
-	QueryLexerSTRING          = 22
-	QueryLexerWS              = 23
+	QueryLexerEC              = 7
+	QueryLexerIN              = 8
+	QueryLexerAS              = 9
+	QueryLexerCBF             = 10
+	QueryLexerSELECT          = 11
+	QueryLexerFROM            = 12
+	QueryLexerFILTER          = 13
+	QueryLexerWILDCARD        = 14
+	QueryLexerDOT             = 15
+	QueryLexerCLAUSE_SAME     = 16
+	QueryLexerCLAUSE_DISTINCT = 17
+	QueryLexerL_PAREN         = 18
+	QueryLexerR_PAREN         = 19
+	QueryLexerAT              = 20
+	QueryLexerIDENT           = 21
+	QueryLexerNUMBER1         = 22
+	QueryLexerZERO            = 23
+	QueryLexerSTRING          = 24
+	QueryLexerWS              = 25
 )
diff --git a/netmap/parser/query_parser.go b/netmap/parser/query_parser.go
index db19c93..33f1cf0 100644
--- a/netmap/parser/query_parser.go
+++ b/netmap/parser/query_parser.go
@@ -1,4 +1,4 @@
-// Code generated from Query.g4 by ANTLR 4.13.0. DO NOT EDIT.
+// Code generated from /repo/frostfs/sdk-go/netmap/parser/Query.g4 by ANTLR 4.13.0. DO NOT EDIT.
 
 package parser // Query
 
@@ -33,88 +33,93 @@ var QueryParserStaticData struct {
 func queryParserInit() {
 	staticData := &QueryParserStaticData
 	staticData.LiteralNames = []string{
-		"", "'NOT'", "'AND'", "'OR'", "", "'UNIQUE'", "'REP'", "'IN'", "'AS'",
-		"'CBF'", "'SELECT'", "'FROM'", "'FILTER'", "'*'", "'SAME'", "'DISTINCT'",
-		"'('", "')'", "'@'", "", "", "'0'",
+		"", "'NOT'", "'AND'", "'OR'", "", "'UNIQUE'", "'REP'", "'EC'", "'IN'",
+		"'AS'", "'CBF'", "'SELECT'", "'FROM'", "'FILTER'", "'*'", "'.'", "'SAME'",
+		"'DISTINCT'", "'('", "')'", "'@'", "", "", "'0'",
 	}
 	staticData.SymbolicNames = []string{
-		"", "NOT_OP", "AND_OP", "OR_OP", "SIMPLE_OP", "UNIQUE", "REP", "IN",
-		"AS", "CBF", "SELECT", "FROM", "FILTER", "WILDCARD", "CLAUSE_SAME",
+		"", "NOT_OP", "AND_OP", "OR_OP", "SIMPLE_OP", "UNIQUE", "REP", "EC",
+		"IN", "AS", "CBF", "SELECT", "FROM", "FILTER", "WILDCARD", "DOT", "CLAUSE_SAME",
 		"CLAUSE_DISTINCT", "L_PAREN", "R_PAREN", "AT", "IDENT", "NUMBER1", "ZERO",
 		"STRING", "WS",
 	}
 	staticData.RuleNames = []string{
-		"policy", "selectFilterExpr", "repStmt", "cbfStmt", "selectStmt", "clause",
-		"filterExpr", "filterStmt", "expr", "filterKey", "filterValue", "number",
-		"keyword", "ident", "identWC",
+		"policy", "selectFilterExpr", "ecStmt", "repStmt", "cbfStmt", "selectStmt",
+		"clause", "filterExpr", "filterStmt", "expr", "filterKey", "filterValue",
+		"number", "keyword", "ident", "identWC",
 	}
 	staticData.PredictionContextCache = antlr.NewPredictionContextCache()
 	staticData.serializedATN = []int32{
-		4, 1, 23, 154, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2, 4, 7,
+		4, 1, 25, 165, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2, 4, 7,
 		4, 2, 5, 7, 5, 2, 6, 7, 6, 2, 7, 7, 7, 2, 8, 7, 8, 2, 9, 7, 9, 2, 10, 7,
-		10, 2, 11, 7, 11, 2, 12, 7, 12, 2, 13, 7, 13, 2, 14, 7, 14, 1, 0, 3, 0,
-		32, 8, 0, 1, 0, 4, 0, 35, 8, 0, 11, 0, 12, 0, 36, 1, 0, 3, 0, 40, 8, 0,
-		1, 0, 5, 0, 43, 8, 0, 10, 0, 12, 0, 46, 9, 0, 1, 0, 5, 0, 49, 8, 0, 10,
-		0, 12, 0, 52, 9, 0, 1, 0, 1, 0, 1, 1, 3, 1, 57, 8, 1, 1, 1, 3, 1, 60, 8,
-		1, 1, 1, 5, 1, 63, 8, 1, 10, 1, 12, 1, 66, 9, 1, 1, 1, 1, 1, 1, 2, 1, 2,
-		1, 2, 1, 2, 3, 2, 74, 8, 2, 1, 3, 1, 3, 1, 3, 1, 4, 1, 4, 1, 4, 1, 4, 3,
-		4, 83, 8, 4, 1, 4, 3, 4, 86, 8, 4, 1, 4, 1, 4, 1, 4, 1, 4, 3, 4, 92, 8,
-		4, 1, 5, 1, 5, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1,
-		6, 1, 6, 3, 6, 107, 8, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 5, 6, 115,
-		8, 6, 10, 6, 12, 6, 118, 9, 6, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 8, 1, 8,
-		1, 8, 1, 8, 1, 8, 1, 8, 3, 8, 131, 8, 8, 1, 9, 1, 9, 3, 9, 135, 8, 9, 1,
-		10, 1, 10, 1, 10, 3, 10, 140, 8, 10, 1, 11, 1, 11, 1, 12, 1, 12, 1, 13,
-		1, 13, 3, 13, 148, 8, 13, 1, 14, 1, 14, 3, 14, 152, 8, 14, 1, 14, 0, 1,
-		12, 15, 0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 0, 3, 1,
-		0, 14, 15, 1, 0, 20, 21, 2, 0, 6, 8, 10, 12, 160, 0, 31, 1, 0, 0, 0, 2,
-		56, 1, 0, 0, 0, 4, 69, 1, 0, 0, 0, 6, 75, 1, 0, 0, 0, 8, 78, 1, 0, 0, 0,
-		10, 93, 1, 0, 0, 0, 12, 106, 1, 0, 0, 0, 14, 119, 1, 0, 0, 0, 16, 130,
-		1, 0, 0, 0, 18, 134, 1, 0, 0, 0, 20, 139, 1, 0, 0, 0, 22, 141, 1, 0, 0,
-		0, 24, 143, 1, 0, 0, 0, 26, 147, 1, 0, 0, 0, 28, 151, 1, 0, 0, 0, 30, 32,
-		5, 5, 0, 0, 31, 30, 1, 0, 0, 0, 31, 32, 1, 0, 0, 0, 32, 34, 1, 0, 0, 0,
-		33, 35, 3, 4, 2, 0, 34, 33, 1, 0, 0, 0, 35, 36, 1, 0, 0, 0, 36, 34, 1,
-		0, 0, 0, 36, 37, 1, 0, 0, 0, 37, 39, 1, 0, 0, 0, 38, 40, 3, 6, 3, 0, 39,
-		38, 1, 0, 0, 0, 39, 40, 1, 0, 0, 0, 40, 44, 1, 0, 0, 0, 41, 43, 3, 8, 4,
-		0, 42, 41, 1, 0, 0, 0, 43, 46, 1, 0, 0, 0, 44, 42, 1, 0, 0, 0, 44, 45,
-		1, 0, 0, 0, 45, 50, 1, 0, 0, 0, 46, 44, 1, 0, 0, 0, 47, 49, 3, 14, 7, 0,
-		48, 47, 1, 0, 0, 0, 49, 52, 1, 0, 0, 0, 50, 48, 1, 0, 0, 0, 50, 51, 1,
-		0, 0, 0, 51, 53, 1, 0, 0, 0, 52, 50, 1, 0, 0, 0, 53, 54, 5, 0, 0, 1, 54,
-		1, 1, 0, 0, 0, 55, 57, 3, 6, 3, 0, 56, 55, 1, 0, 0, 0, 56, 57, 1, 0, 0,
-		0, 57, 59, 1, 0, 0, 0, 58, 60, 3, 8, 4, 0, 59, 58, 1, 0, 0, 0, 59, 60,
-		1, 0, 0, 0, 60, 64, 1, 0, 0, 0, 61, 63, 3, 14, 7, 0, 62, 61, 1, 0, 0, 0,
-		63, 66, 1, 0, 0, 0, 64, 62, 1, 0, 0, 0, 64, 65, 1, 0, 0, 0, 65, 67, 1,
-		0, 0, 0, 66, 64, 1, 0, 0, 0, 67, 68, 5, 0, 0, 1, 68, 3, 1, 0, 0, 0, 69,
-		70, 5, 6, 0, 0, 70, 73, 5, 20, 0, 0, 71, 72, 5, 7, 0, 0, 72, 74, 3, 26,
-		13, 0, 73, 71, 1, 0, 0, 0, 73, 74, 1, 0, 0, 0, 74, 5, 1, 0, 0, 0, 75, 76,
-		5, 9, 0, 0, 76, 77, 5, 20, 0, 0, 77, 7, 1, 0, 0, 0, 78, 79, 5, 10, 0, 0,
-		79, 85, 5, 20, 0, 0, 80, 82, 5, 7, 0, 0, 81, 83, 3, 10, 5, 0, 82, 81, 1,
-		0, 0, 0, 82, 83, 1, 0, 0, 0, 83, 84, 1, 0, 0, 0, 84, 86, 3, 26, 13, 0,
-		85, 80, 1, 0, 0, 0, 85, 86, 1, 0, 0, 0, 86, 87, 1, 0, 0, 0, 87, 88, 5,
-		11, 0, 0, 88, 91, 3, 28, 14, 0, 89, 90, 5, 8, 0, 0, 90, 92, 3, 26, 13,
-		0, 91, 89, 1, 0, 0, 0, 91, 92, 1, 0, 0, 0, 92, 9, 1, 0, 0, 0, 93, 94, 7,
-		0, 0, 0, 94, 11, 1, 0, 0, 0, 95, 96, 6, 6, -1, 0, 96, 97, 5, 1, 0, 0, 97,
-		98, 5, 16, 0, 0, 98, 99, 3, 12, 6, 0, 99, 100, 5, 17, 0, 0, 100, 107, 1,
-		0, 0, 0, 101, 102, 5, 16, 0, 0, 102, 103, 3, 12, 6, 0, 103, 104, 5, 17,
-		0, 0, 104, 107, 1, 0, 0, 0, 105, 107, 3, 16, 8, 0, 106, 95, 1, 0, 0, 0,
-		106, 101, 1, 0, 0, 0, 106, 105, 1, 0, 0, 0, 107, 116, 1, 0, 0, 0, 108,
-		109, 10, 4, 0, 0, 109, 110, 5, 2, 0, 0, 110, 115, 3, 12, 6, 5, 111, 112,
-		10, 3, 0, 0, 112, 113, 5, 3, 0, 0, 113, 115, 3, 12, 6, 4, 114, 108, 1,
-		0, 0, 0, 114, 111, 1, 0, 0, 0, 115, 118, 1, 0, 0, 0, 116, 114, 1, 0, 0,
-		0, 116, 117, 1, 0, 0, 0, 117, 13, 1, 0, 0, 0, 118, 116, 1, 0, 0, 0, 119,
-		120, 5, 12, 0, 0, 120, 121, 3, 12, 6, 0, 121, 122, 5, 8, 0, 0, 122, 123,
-		3, 26, 13, 0, 123, 15, 1, 0, 0, 0, 124, 125, 5, 18, 0, 0, 125, 131, 3,
-		26, 13, 0, 126, 127, 3, 18, 9, 0, 127, 128, 5, 4, 0, 0, 128, 129, 3, 20,
-		10, 0, 129, 131, 1, 0, 0, 0, 130, 124, 1, 0, 0, 0, 130, 126, 1, 0, 0, 0,
-		131, 17, 1, 0, 0, 0, 132, 135, 3, 26, 13, 0, 133, 135, 5, 22, 0, 0, 134,
-		132, 1, 0, 0, 0, 134, 133, 1, 0, 0, 0, 135, 19, 1, 0, 0, 0, 136, 140, 3,
-		26, 13, 0, 137, 140, 3, 22, 11, 0, 138, 140, 5, 22, 0, 0, 139, 136, 1,
-		0, 0, 0, 139, 137, 1, 0, 0, 0, 139, 138, 1, 0, 0, 0, 140, 21, 1, 0, 0,
-		0, 141, 142, 7, 1, 0, 0, 142, 23, 1, 0, 0, 0, 143, 144, 7, 2, 0, 0, 144,
-		25, 1, 0, 0, 0, 145, 148, 3, 24, 12, 0, 146, 148, 5, 19, 0, 0, 147, 145,
-		1, 0, 0, 0, 147, 146, 1, 0, 0, 0, 148, 27, 1, 0, 0, 0, 149, 152, 3, 26,
-		13, 0, 150, 152, 5, 13, 0, 0, 151, 149, 1, 0, 0, 0, 151, 150, 1, 0, 0,
-		0, 152, 29, 1, 0, 0, 0, 20, 31, 36, 39, 44, 50, 56, 59, 64, 73, 82, 85,
-		91, 106, 114, 116, 130, 134, 139, 147, 151,
+		10, 2, 11, 7, 11, 2, 12, 7, 12, 2, 13, 7, 13, 2, 14, 7, 14, 2, 15, 7, 15,
+		1, 0, 3, 0, 34, 8, 0, 1, 0, 1, 0, 4, 0, 38, 8, 0, 11, 0, 12, 0, 39, 1,
+		0, 3, 0, 43, 8, 0, 1, 0, 5, 0, 46, 8, 0, 10, 0, 12, 0, 49, 9, 0, 1, 0,
+		5, 0, 52, 8, 0, 10, 0, 12, 0, 55, 9, 0, 1, 0, 1, 0, 1, 1, 3, 1, 60, 8,
+		1, 1, 1, 3, 1, 63, 8, 1, 1, 1, 5, 1, 66, 8, 1, 10, 1, 12, 1, 69, 9, 1,
+		1, 1, 1, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 3, 2, 79, 8, 2, 1, 3, 1,
+		3, 1, 3, 1, 3, 3, 3, 85, 8, 3, 1, 4, 1, 4, 1, 4, 1, 5, 1, 5, 1, 5, 1, 5,
+		3, 5, 94, 8, 5, 1, 5, 3, 5, 97, 8, 5, 1, 5, 1, 5, 1, 5, 1, 5, 3, 5, 103,
+		8, 5, 1, 6, 1, 6, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7,
+		1, 7, 1, 7, 3, 7, 118, 8, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 5, 7,
+		126, 8, 7, 10, 7, 12, 7, 129, 9, 7, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 9,
+		1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 3, 9, 142, 8, 9, 1, 10, 1, 10, 3, 10, 146,
+		8, 10, 1, 11, 1, 11, 1, 11, 3, 11, 151, 8, 11, 1, 12, 1, 12, 1, 13, 1,
+		13, 1, 14, 1, 14, 3, 14, 159, 8, 14, 1, 15, 1, 15, 3, 15, 163, 8, 15, 1,
+		15, 0, 1, 14, 16, 0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28,
+		30, 0, 3, 1, 0, 16, 17, 1, 0, 22, 23, 3, 0, 6, 6, 8, 9, 11, 13, 172, 0,
+		33, 1, 0, 0, 0, 2, 59, 1, 0, 0, 0, 4, 72, 1, 0, 0, 0, 6, 80, 1, 0, 0, 0,
+		8, 86, 1, 0, 0, 0, 10, 89, 1, 0, 0, 0, 12, 104, 1, 0, 0, 0, 14, 117, 1,
+		0, 0, 0, 16, 130, 1, 0, 0, 0, 18, 141, 1, 0, 0, 0, 20, 145, 1, 0, 0, 0,
+		22, 150, 1, 0, 0, 0, 24, 152, 1, 0, 0, 0, 26, 154, 1, 0, 0, 0, 28, 158,
+		1, 0, 0, 0, 30, 162, 1, 0, 0, 0, 32, 34, 5, 5, 0, 0, 33, 32, 1, 0, 0, 0,
+		33, 34, 1, 0, 0, 0, 34, 37, 1, 0, 0, 0, 35, 38, 3, 6, 3, 0, 36, 38, 3,
+		4, 2, 0, 37, 35, 1, 0, 0, 0, 37, 36, 1, 0, 0, 0, 38, 39, 1, 0, 0, 0, 39,
+		37, 1, 0, 0, 0, 39, 40, 1, 0, 0, 0, 40, 42, 1, 0, 0, 0, 41, 43, 3, 8, 4,
+		0, 42, 41, 1, 0, 0, 0, 42, 43, 1, 0, 0, 0, 43, 47, 1, 0, 0, 0, 44, 46,
+		3, 10, 5, 0, 45, 44, 1, 0, 0, 0, 46, 49, 1, 0, 0, 0, 47, 45, 1, 0, 0, 0,
+		47, 48, 1, 0, 0, 0, 48, 53, 1, 0, 0, 0, 49, 47, 1, 0, 0, 0, 50, 52, 3,
+		16, 8, 0, 51, 50, 1, 0, 0, 0, 52, 55, 1, 0, 0, 0, 53, 51, 1, 0, 0, 0, 53,
+		54, 1, 0, 0, 0, 54, 56, 1, 0, 0, 0, 55, 53, 1, 0, 0, 0, 56, 57, 5, 0, 0,
+		1, 57, 1, 1, 0, 0, 0, 58, 60, 3, 8, 4, 0, 59, 58, 1, 0, 0, 0, 59, 60, 1,
+		0, 0, 0, 60, 62, 1, 0, 0, 0, 61, 63, 3, 10, 5, 0, 62, 61, 1, 0, 0, 0, 62,
+		63, 1, 0, 0, 0, 63, 67, 1, 0, 0, 0, 64, 66, 3, 16, 8, 0, 65, 64, 1, 0,
+		0, 0, 66, 69, 1, 0, 0, 0, 67, 65, 1, 0, 0, 0, 67, 68, 1, 0, 0, 0, 68, 70,
+		1, 0, 0, 0, 69, 67, 1, 0, 0, 0, 70, 71, 5, 0, 0, 1, 71, 3, 1, 0, 0, 0,
+		72, 73, 5, 7, 0, 0, 73, 74, 5, 22, 0, 0, 74, 75, 5, 15, 0, 0, 75, 78, 5,
+		22, 0, 0, 76, 77, 5, 8, 0, 0, 77, 79, 3, 28, 14, 0, 78, 76, 1, 0, 0, 0,
+		78, 79, 1, 0, 0, 0, 79, 5, 1, 0, 0, 0, 80, 81, 5, 6, 0, 0, 81, 84, 5, 22,
+		0, 0, 82, 83, 5, 8, 0, 0, 83, 85, 3, 28, 14, 0, 84, 82, 1, 0, 0, 0, 84,
+		85, 1, 0, 0, 0, 85, 7, 1, 0, 0, 0, 86, 87, 5, 10, 0, 0, 87, 88, 5, 22,
+		0, 0, 88, 9, 1, 0, 0, 0, 89, 90, 5, 11, 0, 0, 90, 96, 5, 22, 0, 0, 91,
+		93, 5, 8, 0, 0, 92, 94, 3, 12, 6, 0, 93, 92, 1, 0, 0, 0, 93, 94, 1, 0,
+		0, 0, 94, 95, 1, 0, 0, 0, 95, 97, 3, 28, 14, 0, 96, 91, 1, 0, 0, 0, 96,
+		97, 1, 0, 0, 0, 97, 98, 1, 0, 0, 0, 98, 99, 5, 12, 0, 0, 99, 102, 3, 30,
+		15, 0, 100, 101, 5, 9, 0, 0, 101, 103, 3, 28, 14, 0, 102, 100, 1, 0, 0,
+		0, 102, 103, 1, 0, 0, 0, 103, 11, 1, 0, 0, 0, 104, 105, 7, 0, 0, 0, 105,
+		13, 1, 0, 0, 0, 106, 107, 6, 7, -1, 0, 107, 108, 5, 1, 0, 0, 108, 109,
+		5, 18, 0, 0, 109, 110, 3, 14, 7, 0, 110, 111, 5, 19, 0, 0, 111, 118, 1,
+		0, 0, 0, 112, 113, 5, 18, 0, 0, 113, 114, 3, 14, 7, 0, 114, 115, 5, 19,
+		0, 0, 115, 118, 1, 0, 0, 0, 116, 118, 3, 18, 9, 0, 117, 106, 1, 0, 0, 0,
+		117, 112, 1, 0, 0, 0, 117, 116, 1, 0, 0, 0, 118, 127, 1, 0, 0, 0, 119,
+		120, 10, 4, 0, 0, 120, 121, 5, 2, 0, 0, 121, 126, 3, 14, 7, 5, 122, 123,
+		10, 3, 0, 0, 123, 124, 5, 3, 0, 0, 124, 126, 3, 14, 7, 4, 125, 119, 1,
+		0, 0, 0, 125, 122, 1, 0, 0, 0, 126, 129, 1, 0, 0, 0, 127, 125, 1, 0, 0,
+		0, 127, 128, 1, 0, 0, 0, 128, 15, 1, 0, 0, 0, 129, 127, 1, 0, 0, 0, 130,
+		131, 5, 13, 0, 0, 131, 132, 3, 14, 7, 0, 132, 133, 5, 9, 0, 0, 133, 134,
+		3, 28, 14, 0, 134, 17, 1, 0, 0, 0, 135, 136, 5, 20, 0, 0, 136, 142, 3,
+		28, 14, 0, 137, 138, 3, 20, 10, 0, 138, 139, 5, 4, 0, 0, 139, 140, 3, 22,
+		11, 0, 140, 142, 1, 0, 0, 0, 141, 135, 1, 0, 0, 0, 141, 137, 1, 0, 0, 0,
+		142, 19, 1, 0, 0, 0, 143, 146, 3, 28, 14, 0, 144, 146, 5, 24, 0, 0, 145,
+		143, 1, 0, 0, 0, 145, 144, 1, 0, 0, 0, 146, 21, 1, 0, 0, 0, 147, 151, 3,
+		28, 14, 0, 148, 151, 3, 24, 12, 0, 149, 151, 5, 24, 0, 0, 150, 147, 1,
+		0, 0, 0, 150, 148, 1, 0, 0, 0, 150, 149, 1, 0, 0, 0, 151, 23, 1, 0, 0,
+		0, 152, 153, 7, 1, 0, 0, 153, 25, 1, 0, 0, 0, 154, 155, 7, 2, 0, 0, 155,
+		27, 1, 0, 0, 0, 156, 159, 3, 26, 13, 0, 157, 159, 5, 21, 0, 0, 158, 156,
+		1, 0, 0, 0, 158, 157, 1, 0, 0, 0, 159, 29, 1, 0, 0, 0, 160, 163, 3, 28,
+		14, 0, 161, 163, 5, 14, 0, 0, 162, 160, 1, 0, 0, 0, 162, 161, 1, 0, 0,
+		0, 163, 31, 1, 0, 0, 0, 22, 33, 37, 39, 42, 47, 53, 59, 62, 67, 78, 84,
+		93, 96, 102, 117, 125, 127, 141, 145, 150, 158, 162,
 	}
 	deserializer := antlr.NewATNDeserializer(nil)
 	staticData.atn = deserializer.Deserialize(staticData.serializedATN)
@@ -159,42 +164,45 @@ const (
 	QuerySIMPLE_OP       = 4
 	QueryUNIQUE          = 5
 	QueryREP             = 6
-	QueryIN              = 7
-	QueryAS              = 8
-	QueryCBF             = 9
-	QuerySELECT          = 10
-	QueryFROM            = 11
-	QueryFILTER          = 12
-	QueryWILDCARD        = 13
-	QueryCLAUSE_SAME     = 14
-	QueryCLAUSE_DISTINCT = 15
-	QueryL_PAREN         = 16
-	QueryR_PAREN         = 17
-	QueryAT              = 18
-	QueryIDENT           = 19
-	QueryNUMBER1         = 20
-	QueryZERO            = 21
-	QuerySTRING          = 22
-	QueryWS              = 23
+	QueryEC              = 7
+	QueryIN              = 8
+	QueryAS              = 9
+	QueryCBF             = 10
+	QuerySELECT          = 11
+	QueryFROM            = 12
+	QueryFILTER          = 13
+	QueryWILDCARD        = 14
+	QueryDOT             = 15
+	QueryCLAUSE_SAME     = 16
+	QueryCLAUSE_DISTINCT = 17
+	QueryL_PAREN         = 18
+	QueryR_PAREN         = 19
+	QueryAT              = 20
+	QueryIDENT           = 21
+	QueryNUMBER1         = 22
+	QueryZERO            = 23
+	QuerySTRING          = 24
+	QueryWS              = 25
 )
 
 // Query rules.
 const (
 	QueryRULE_policy           = 0
 	QueryRULE_selectFilterExpr = 1
-	QueryRULE_repStmt          = 2
-	QueryRULE_cbfStmt          = 3
-	QueryRULE_selectStmt       = 4
-	QueryRULE_clause           = 5
-	QueryRULE_filterExpr       = 6
-	QueryRULE_filterStmt       = 7
-	QueryRULE_expr             = 8
-	QueryRULE_filterKey        = 9
-	QueryRULE_filterValue      = 10
-	QueryRULE_number           = 11
-	QueryRULE_keyword          = 12
-	QueryRULE_ident            = 13
-	QueryRULE_identWC          = 14
+	QueryRULE_ecStmt           = 2
+	QueryRULE_repStmt          = 3
+	QueryRULE_cbfStmt          = 4
+	QueryRULE_selectStmt       = 5
+	QueryRULE_clause           = 6
+	QueryRULE_filterExpr       = 7
+	QueryRULE_filterStmt       = 8
+	QueryRULE_expr             = 9
+	QueryRULE_filterKey        = 10
+	QueryRULE_filterValue      = 11
+	QueryRULE_number           = 12
+	QueryRULE_keyword          = 13
+	QueryRULE_ident            = 14
+	QueryRULE_identWC          = 15
 )
 
 // IPolicyContext is an interface to support dynamic dispatch.
@@ -209,6 +217,8 @@ type IPolicyContext interface {
 	UNIQUE() antlr.TerminalNode
 	AllRepStmt() []IRepStmtContext
 	RepStmt(i int) IRepStmtContext
+	AllEcStmt() []IEcStmtContext
+	EcStmt(i int) IEcStmtContext
 	CbfStmt() ICbfStmtContext
 	AllSelectStmt() []ISelectStmtContext
 	SelectStmt(i int) ISelectStmtContext
@@ -300,6 +310,47 @@ func (s *PolicyContext) RepStmt(i int) IRepStmtContext {
 	return t.(IRepStmtContext)
 }
 
+func (s *PolicyContext) AllEcStmt() []IEcStmtContext {
+	children := s.GetChildren()
+	len := 0
+	for _, ctx := range children {
+		if _, ok := ctx.(IEcStmtContext); ok {
+			len++
+		}
+	}
+
+	tst := make([]IEcStmtContext, len)
+	i := 0
+	for _, ctx := range children {
+		if t, ok := ctx.(IEcStmtContext); ok {
+			tst[i] = t.(IEcStmtContext)
+			i++
+		}
+	}
+
+	return tst
+}
+
+func (s *PolicyContext) EcStmt(i int) IEcStmtContext {
+	var t antlr.RuleContext
+	j := 0
+	for _, ctx := range s.GetChildren() {
+		if _, ok := ctx.(IEcStmtContext); ok {
+			if j == i {
+				t = ctx.(antlr.RuleContext)
+				break
+			}
+			j++
+		}
+	}
+
+	if t == nil {
+		return nil
+	}
+
+	return t.(IEcStmtContext)
+}
+
 func (s *PolicyContext) CbfStmt() ICbfStmtContext {
 	var t antlr.RuleContext
 	for _, ctx := range s.GetChildren() {
@@ -422,7 +473,7 @@ func (p *Query) Policy() (localctx IPolicyContext) {
 	var _la int
 
 	p.EnterOuterAlt(localctx, 1)
-	p.SetState(31)
+	p.SetState(33)
 	p.GetErrorHandler().Sync(p)
 	if p.HasError() {
 		goto errorExit
@@ -431,7 +482,7 @@ func (p *Query) Policy() (localctx IPolicyContext) {
 
 	if _la == QueryUNIQUE {
 		{
-			p.SetState(30)
+			p.SetState(32)
 			p.Match(QueryUNIQUE)
 			if p.HasError() {
 				// Recognition error - abort rule
@@ -440,27 +491,46 @@ func (p *Query) Policy() (localctx IPolicyContext) {
 		}
 
 	}
-	p.SetState(34)
+	p.SetState(37)
 	p.GetErrorHandler().Sync(p)
 	if p.HasError() {
 		goto errorExit
 	}
 	_la = p.GetTokenStream().LA(1)
 
-	for ok := true; ok; ok = _la == QueryREP {
-		{
-			p.SetState(33)
-			p.RepStmt()
+	for ok := true; ok; ok = _la == QueryREP || _la == QueryEC {
+		p.SetState(37)
+		p.GetErrorHandler().Sync(p)
+		if p.HasError() {
+			goto errorExit
 		}
 
-		p.SetState(36)
+		switch p.GetTokenStream().LA(1) {
+		case QueryREP:
+			{
+				p.SetState(35)
+				p.RepStmt()
+			}
+
+		case QueryEC:
+			{
+				p.SetState(36)
+				p.EcStmt()
+			}
+
+		default:
+			p.SetError(antlr.NewNoViableAltException(p, nil, nil, nil, nil, nil))
+			goto errorExit
+		}
+
+		p.SetState(39)
 		p.GetErrorHandler().Sync(p)
 		if p.HasError() {
 			goto errorExit
 		}
 		_la = p.GetTokenStream().LA(1)
 	}
-	p.SetState(39)
+	p.SetState(42)
 	p.GetErrorHandler().Sync(p)
 	if p.HasError() {
 		goto errorExit
@@ -469,12 +539,12 @@ func (p *Query) Policy() (localctx IPolicyContext) {
 
 	if _la == QueryCBF {
 		{
-			p.SetState(38)
+			p.SetState(41)
 			p.CbfStmt()
 		}
 
 	}
-	p.SetState(44)
+	p.SetState(47)
 	p.GetErrorHandler().Sync(p)
 	if p.HasError() {
 		goto errorExit
@@ -483,18 +553,18 @@ func (p *Query) Policy() (localctx IPolicyContext) {
 
 	for _la == QuerySELECT {
 		{
-			p.SetState(41)
+			p.SetState(44)
 			p.SelectStmt()
 		}
 
-		p.SetState(46)
+		p.SetState(49)
 		p.GetErrorHandler().Sync(p)
 		if p.HasError() {
 			goto errorExit
 		}
 		_la = p.GetTokenStream().LA(1)
 	}
-	p.SetState(50)
+	p.SetState(53)
 	p.GetErrorHandler().Sync(p)
 	if p.HasError() {
 		goto errorExit
@@ -503,11 +573,11 @@ func (p *Query) Policy() (localctx IPolicyContext) {
 
 	for _la == QueryFILTER {
 		{
-			p.SetState(47)
+			p.SetState(50)
 			p.FilterStmt()
 		}
 
-		p.SetState(52)
+		p.SetState(55)
 		p.GetErrorHandler().Sync(p)
 		if p.HasError() {
 			goto errorExit
@@ -515,7 +585,7 @@ func (p *Query) Policy() (localctx IPolicyContext) {
 		_la = p.GetTokenStream().LA(1)
 	}
 	{
-		p.SetState(53)
+		p.SetState(56)
 		p.Match(QueryEOF)
 		if p.HasError() {
 			// Recognition error - abort rule
@@ -687,7 +757,7 @@ func (p *Query) SelectFilterExpr() (localctx ISelectFilterExprContext) {
 	var _la int
 
 	p.EnterOuterAlt(localctx, 1)
-	p.SetState(56)
+	p.SetState(59)
 	p.GetErrorHandler().Sync(p)
 	if p.HasError() {
 		goto errorExit
@@ -696,12 +766,12 @@ func (p *Query) SelectFilterExpr() (localctx ISelectFilterExprContext) {
 
 	if _la == QueryCBF {
 		{
-			p.SetState(55)
+			p.SetState(58)
 			p.CbfStmt()
 		}
 
 	}
-	p.SetState(59)
+	p.SetState(62)
 	p.GetErrorHandler().Sync(p)
 	if p.HasError() {
 		goto errorExit
@@ -710,12 +780,12 @@ func (p *Query) SelectFilterExpr() (localctx ISelectFilterExprContext) {
 
 	if _la == QuerySELECT {
 		{
-			p.SetState(58)
+			p.SetState(61)
 			p.SelectStmt()
 		}
 
 	}
-	p.SetState(64)
+	p.SetState(67)
 	p.GetErrorHandler().Sync(p)
 	if p.HasError() {
 		goto errorExit
@@ -724,11 +794,11 @@ func (p *Query) SelectFilterExpr() (localctx ISelectFilterExprContext) {
 
 	for _la == QueryFILTER {
 		{
-			p.SetState(61)
+			p.SetState(64)
 			p.FilterStmt()
 		}
 
-		p.SetState(66)
+		p.SetState(69)
 		p.GetErrorHandler().Sync(p)
 		if p.HasError() {
 			goto errorExit
@@ -736,7 +806,7 @@ func (p *Query) SelectFilterExpr() (localctx ISelectFilterExprContext) {
 		_la = p.GetTokenStream().LA(1)
 	}
 	{
-		p.SetState(67)
+		p.SetState(70)
 		p.Match(QueryEOF)
 		if p.HasError() {
 			// Recognition error - abort rule
@@ -757,6 +827,227 @@ errorExit:
 	goto errorExit // Trick to prevent compiler error if the label is not used
 }
 
+// IEcStmtContext is an interface to support dynamic dispatch.
+type IEcStmtContext interface {
+	antlr.ParserRuleContext
+
+	// GetParser returns the parser.
+	GetParser() antlr.Parser
+
+	// GetData returns the Data token.
+	GetData() antlr.Token
+
+	// GetParity returns the Parity token.
+	GetParity() antlr.Token
+
+	// SetData sets the Data token.
+	SetData(antlr.Token)
+
+	// SetParity sets the Parity token.
+	SetParity(antlr.Token)
+
+	// GetSelector returns the Selector rule contexts.
+	GetSelector() IIdentContext
+
+	// SetSelector sets the Selector rule contexts.
+	SetSelector(IIdentContext)
+
+	// Getter signatures
+	EC() antlr.TerminalNode
+	DOT() antlr.TerminalNode
+	AllNUMBER1() []antlr.TerminalNode
+	NUMBER1(i int) antlr.TerminalNode
+	IN() antlr.TerminalNode
+	Ident() IIdentContext
+
+	// IsEcStmtContext differentiates from other interfaces.
+	IsEcStmtContext()
+}
+
+type EcStmtContext struct {
+	antlr.BaseParserRuleContext
+	parser   antlr.Parser
+	Data     antlr.Token
+	Parity   antlr.Token
+	Selector IIdentContext
+}
+
+func NewEmptyEcStmtContext() *EcStmtContext {
+	var p = new(EcStmtContext)
+	antlr.InitBaseParserRuleContext(&p.BaseParserRuleContext, nil, -1)
+	p.RuleIndex = QueryRULE_ecStmt
+	return p
+}
+
+func InitEmptyEcStmtContext(p *EcStmtContext) {
+	antlr.InitBaseParserRuleContext(&p.BaseParserRuleContext, nil, -1)
+	p.RuleIndex = QueryRULE_ecStmt
+}
+
+func (*EcStmtContext) IsEcStmtContext() {}
+
+func NewEcStmtContext(parser antlr.Parser, parent antlr.ParserRuleContext, invokingState int) *EcStmtContext {
+	var p = new(EcStmtContext)
+
+	antlr.InitBaseParserRuleContext(&p.BaseParserRuleContext, parent, invokingState)
+
+	p.parser = parser
+	p.RuleIndex = QueryRULE_ecStmt
+
+	return p
+}
+
+func (s *EcStmtContext) GetParser() antlr.Parser { return s.parser }
+
+func (s *EcStmtContext) GetData() antlr.Token { return s.Data }
+
+func (s *EcStmtContext) GetParity() antlr.Token { return s.Parity }
+
+func (s *EcStmtContext) SetData(v antlr.Token) { s.Data = v }
+
+func (s *EcStmtContext) SetParity(v antlr.Token) { s.Parity = v }
+
+func (s *EcStmtContext) GetSelector() IIdentContext { return s.Selector }
+
+func (s *EcStmtContext) SetSelector(v IIdentContext) { s.Selector = v }
+
+func (s *EcStmtContext) EC() antlr.TerminalNode {
+	return s.GetToken(QueryEC, 0)
+}
+
+func (s *EcStmtContext) DOT() antlr.TerminalNode {
+	return s.GetToken(QueryDOT, 0)
+}
+
+func (s *EcStmtContext) AllNUMBER1() []antlr.TerminalNode {
+	return s.GetTokens(QueryNUMBER1)
+}
+
+func (s *EcStmtContext) NUMBER1(i int) antlr.TerminalNode {
+	return s.GetToken(QueryNUMBER1, i)
+}
+
+func (s *EcStmtContext) IN() antlr.TerminalNode {
+	return s.GetToken(QueryIN, 0)
+}
+
+func (s *EcStmtContext) Ident() IIdentContext {
+	var t antlr.RuleContext
+	for _, ctx := range s.GetChildren() {
+		if _, ok := ctx.(IIdentContext); ok {
+			t = ctx.(antlr.RuleContext)
+			break
+		}
+	}
+
+	if t == nil {
+		return nil
+	}
+
+	return t.(IIdentContext)
+}
+
+func (s *EcStmtContext) GetRuleContext() antlr.RuleContext {
+	return s
+}
+
+func (s *EcStmtContext) ToStringTree(ruleNames []string, recog antlr.Recognizer) string {
+	return antlr.TreesStringTree(s, ruleNames, recog)
+}
+
+func (s *EcStmtContext) Accept(visitor antlr.ParseTreeVisitor) interface{} {
+	switch t := visitor.(type) {
+	case QueryVisitor:
+		return t.VisitEcStmt(s)
+
+	default:
+		return t.VisitChildren(s)
+	}
+}
+
+func (p *Query) EcStmt() (localctx IEcStmtContext) {
+	localctx = NewEcStmtContext(p, p.GetParserRuleContext(), p.GetState())
+	p.EnterRule(localctx, 4, QueryRULE_ecStmt)
+	var _la int
+
+	p.EnterOuterAlt(localctx, 1)
+	{
+		p.SetState(72)
+		p.Match(QueryEC)
+		if p.HasError() {
+			// Recognition error - abort rule
+			goto errorExit
+		}
+	}
+	{
+		p.SetState(73)
+
+		var _m = p.Match(QueryNUMBER1)
+
+		localctx.(*EcStmtContext).Data = _m
+		if p.HasError() {
+			// Recognition error - abort rule
+			goto errorExit
+		}
+	}
+	{
+		p.SetState(74)
+		p.Match(QueryDOT)
+		if p.HasError() {
+			// Recognition error - abort rule
+			goto errorExit
+		}
+	}
+	{
+		p.SetState(75)
+
+		var _m = p.Match(QueryNUMBER1)
+
+		localctx.(*EcStmtContext).Parity = _m
+		if p.HasError() {
+			// Recognition error - abort rule
+			goto errorExit
+		}
+	}
+	p.SetState(78)
+	p.GetErrorHandler().Sync(p)
+	if p.HasError() {
+		goto errorExit
+	}
+	_la = p.GetTokenStream().LA(1)
+
+	if _la == QueryIN {
+		{
+			p.SetState(76)
+			p.Match(QueryIN)
+			if p.HasError() {
+				// Recognition error - abort rule
+				goto errorExit
+			}
+		}
+		{
+			p.SetState(77)
+
+			var _x = p.Ident()
+
+			localctx.(*EcStmtContext).Selector = _x
+		}
+
+	}
+
+errorExit:
+	if p.HasError() {
+		v := p.GetError()
+		localctx.SetException(v)
+		p.GetErrorHandler().ReportError(p, v)
+		p.GetErrorHandler().Recover(p, v)
+		p.SetError(nil)
+	}
+	p.ExitRule()
+	return localctx
+	goto errorExit // Trick to prevent compiler error if the label is not used
+}
+
 // IRepStmtContext is an interface to support dynamic dispatch.
 type IRepStmtContext interface {
 	antlr.ParserRuleContext
@@ -876,12 +1167,12 @@ func (s *RepStmtContext) Accept(visitor antlr.ParseTreeVisitor) interface{} {
 
 func (p *Query) RepStmt() (localctx IRepStmtContext) {
 	localctx = NewRepStmtContext(p, p.GetParserRuleContext(), p.GetState())
-	p.EnterRule(localctx, 4, QueryRULE_repStmt)
+	p.EnterRule(localctx, 6, QueryRULE_repStmt)
 	var _la int
 
 	p.EnterOuterAlt(localctx, 1)
 	{
-		p.SetState(69)
+		p.SetState(80)
 		p.Match(QueryREP)
 		if p.HasError() {
 			// Recognition error - abort rule
@@ -889,7 +1180,7 @@ func (p *Query) RepStmt() (localctx IRepStmtContext) {
 		}
 	}
 	{
-		p.SetState(70)
+		p.SetState(81)
 
 		var _m = p.Match(QueryNUMBER1)
 
@@ -899,7 +1190,7 @@ func (p *Query) RepStmt() (localctx IRepStmtContext) {
 			goto errorExit
 		}
 	}
-	p.SetState(73)
+	p.SetState(84)
 	p.GetErrorHandler().Sync(p)
 	if p.HasError() {
 		goto errorExit
@@ -908,7 +1199,7 @@ func (p *Query) RepStmt() (localctx IRepStmtContext) {
 
 	if _la == QueryIN {
 		{
-			p.SetState(71)
+			p.SetState(82)
 			p.Match(QueryIN)
 			if p.HasError() {
 				// Recognition error - abort rule
@@ -916,7 +1207,7 @@ func (p *Query) RepStmt() (localctx IRepStmtContext) {
 			}
 		}
 		{
-			p.SetState(72)
+			p.SetState(83)
 
 			var _x = p.Ident()
 
@@ -1024,10 +1315,10 @@ func (s *CbfStmtContext) Accept(visitor antlr.ParseTreeVisitor) interface{} {
 
 func (p *Query) CbfStmt() (localctx ICbfStmtContext) {
 	localctx = NewCbfStmtContext(p, p.GetParserRuleContext(), p.GetState())
-	p.EnterRule(localctx, 6, QueryRULE_cbfStmt)
+	p.EnterRule(localctx, 8, QueryRULE_cbfStmt)
 	p.EnterOuterAlt(localctx, 1)
 	{
-		p.SetState(75)
+		p.SetState(86)
 		p.Match(QueryCBF)
 		if p.HasError() {
 			// Recognition error - abort rule
@@ -1035,7 +1326,7 @@ func (p *Query) CbfStmt() (localctx ICbfStmtContext) {
 		}
 	}
 	{
-		p.SetState(76)
+		p.SetState(87)
 
 		var _m = p.Match(QueryNUMBER1)
 
@@ -1270,12 +1561,12 @@ func (s *SelectStmtContext) Accept(visitor antlr.ParseTreeVisitor) interface{} {
 
 func (p *Query) SelectStmt() (localctx ISelectStmtContext) {
 	localctx = NewSelectStmtContext(p, p.GetParserRuleContext(), p.GetState())
-	p.EnterRule(localctx, 8, QueryRULE_selectStmt)
+	p.EnterRule(localctx, 10, QueryRULE_selectStmt)
 	var _la int
 
 	p.EnterOuterAlt(localctx, 1)
 	{
-		p.SetState(78)
+		p.SetState(89)
 		p.Match(QuerySELECT)
 		if p.HasError() {
 			// Recognition error - abort rule
@@ -1283,7 +1574,7 @@ func (p *Query) SelectStmt() (localctx ISelectStmtContext) {
 		}
 	}
 	{
-		p.SetState(79)
+		p.SetState(90)
 
 		var _m = p.Match(QueryNUMBER1)
 
@@ -1293,7 +1584,7 @@ func (p *Query) SelectStmt() (localctx ISelectStmtContext) {
 			goto errorExit
 		}
 	}
-	p.SetState(85)
+	p.SetState(96)
 	p.GetErrorHandler().Sync(p)
 	if p.HasError() {
 		goto errorExit
@@ -1302,14 +1593,14 @@ func (p *Query) SelectStmt() (localctx ISelectStmtContext) {
 
 	if _la == QueryIN {
 		{
-			p.SetState(80)
+			p.SetState(91)
 			p.Match(QueryIN)
 			if p.HasError() {
 				// Recognition error - abort rule
 				goto errorExit
 			}
 		}
-		p.SetState(82)
+		p.SetState(93)
 		p.GetErrorHandler().Sync(p)
 		if p.HasError() {
 			goto errorExit
@@ -1318,13 +1609,13 @@ func (p *Query) SelectStmt() (localctx ISelectStmtContext) {
 
 		if _la == QueryCLAUSE_SAME || _la == QueryCLAUSE_DISTINCT {
 			{
-				p.SetState(81)
+				p.SetState(92)
 				p.Clause()
 			}
 
 		}
 		{
-			p.SetState(84)
+			p.SetState(95)
 
 			var _x = p.Ident()
 
@@ -1333,7 +1624,7 @@ func (p *Query) SelectStmt() (localctx ISelectStmtContext) {
 
 	}
 	{
-		p.SetState(87)
+		p.SetState(98)
 		p.Match(QueryFROM)
 		if p.HasError() {
 			// Recognition error - abort rule
@@ -1341,13 +1632,13 @@ func (p *Query) SelectStmt() (localctx ISelectStmtContext) {
 		}
 	}
 	{
-		p.SetState(88)
+		p.SetState(99)
 
 		var _x = p.IdentWC()
 
 		localctx.(*SelectStmtContext).Filter = _x
 	}
-	p.SetState(91)
+	p.SetState(102)
 	p.GetErrorHandler().Sync(p)
 	if p.HasError() {
 		goto errorExit
@@ -1356,7 +1647,7 @@ func (p *Query) SelectStmt() (localctx ISelectStmtContext) {
 
 	if _la == QueryAS {
 		{
-			p.SetState(89)
+			p.SetState(100)
 			p.Match(QueryAS)
 			if p.HasError() {
 				// Recognition error - abort rule
@@ -1364,7 +1655,7 @@ func (p *Query) SelectStmt() (localctx ISelectStmtContext) {
 			}
 		}
 		{
-			p.SetState(90)
+			p.SetState(101)
 
 			var _x = p.Ident()
 
@@ -1461,12 +1752,12 @@ func (s *ClauseContext) Accept(visitor antlr.ParseTreeVisitor) interface{} {
 
 func (p *Query) Clause() (localctx IClauseContext) {
 	localctx = NewClauseContext(p, p.GetParserRuleContext(), p.GetState())
-	p.EnterRule(localctx, 10, QueryRULE_clause)
+	p.EnterRule(localctx, 12, QueryRULE_clause)
 	var _la int
 
 	p.EnterOuterAlt(localctx, 1)
 	{
-		p.SetState(93)
+		p.SetState(104)
 		_la = p.GetTokenStream().LA(1)
 
 		if !(_la == QueryCLAUSE_SAME || _la == QueryCLAUSE_DISTINCT) {
@@ -1693,12 +1984,12 @@ func (p *Query) filterExpr(_p int) (localctx IFilterExprContext) {
 	localctx = NewFilterExprContext(p, p.GetParserRuleContext(), _parentState)
 	var _prevctx IFilterExprContext = localctx
 	var _ antlr.ParserRuleContext = _prevctx // TODO: To prevent unused variable warning.
-	_startState := 12
-	p.EnterRecursionRule(localctx, 12, QueryRULE_filterExpr, _p)
+	_startState := 14
+	p.EnterRecursionRule(localctx, 14, QueryRULE_filterExpr, _p)
 	var _alt int
 
 	p.EnterOuterAlt(localctx, 1)
-	p.SetState(106)
+	p.SetState(117)
 	p.GetErrorHandler().Sync(p)
 	if p.HasError() {
 		goto errorExit
@@ -1707,7 +1998,7 @@ func (p *Query) filterExpr(_p int) (localctx IFilterExprContext) {
 	switch p.GetTokenStream().LA(1) {
 	case QueryNOT_OP:
 		{
-			p.SetState(96)
+			p.SetState(107)
 
 			var _m = p.Match(QueryNOT_OP)
 
@@ -1718,7 +2009,7 @@ func (p *Query) filterExpr(_p int) (localctx IFilterExprContext) {
 			}
 		}
 		{
-			p.SetState(97)
+			p.SetState(108)
 			p.Match(QueryL_PAREN)
 			if p.HasError() {
 				// Recognition error - abort rule
@@ -1726,14 +2017,14 @@ func (p *Query) filterExpr(_p int) (localctx IFilterExprContext) {
 			}
 		}
 		{
-			p.SetState(98)
+			p.SetState(109)
 
 			var _x = p.filterExpr(0)
 
 			localctx.(*FilterExprContext).F1 = _x
 		}
 		{
-			p.SetState(99)
+			p.SetState(110)
 			p.Match(QueryR_PAREN)
 			if p.HasError() {
 				// Recognition error - abort rule
@@ -1743,7 +2034,7 @@ func (p *Query) filterExpr(_p int) (localctx IFilterExprContext) {
 
 	case QueryL_PAREN:
 		{
-			p.SetState(101)
+			p.SetState(112)
 			p.Match(QueryL_PAREN)
 			if p.HasError() {
 				// Recognition error - abort rule
@@ -1751,14 +2042,14 @@ func (p *Query) filterExpr(_p int) (localctx IFilterExprContext) {
 			}
 		}
 		{
-			p.SetState(102)
+			p.SetState(113)
 
 			var _x = p.filterExpr(0)
 
 			localctx.(*FilterExprContext).Inner = _x
 		}
 		{
-			p.SetState(103)
+			p.SetState(114)
 			p.Match(QueryR_PAREN)
 			if p.HasError() {
 				// Recognition error - abort rule
@@ -1768,7 +2059,7 @@ func (p *Query) filterExpr(_p int) (localctx IFilterExprContext) {
 
 	case QueryREP, QueryIN, QueryAS, QuerySELECT, QueryFROM, QueryFILTER, QueryAT, QueryIDENT, QuerySTRING:
 		{
-			p.SetState(105)
+			p.SetState(116)
 			p.Expr()
 		}
 
@@ -1777,12 +2068,12 @@ func (p *Query) filterExpr(_p int) (localctx IFilterExprContext) {
 		goto errorExit
 	}
 	p.GetParserRuleContext().SetStop(p.GetTokenStream().LT(-1))
-	p.SetState(116)
+	p.SetState(127)
 	p.GetErrorHandler().Sync(p)
 	if p.HasError() {
 		goto errorExit
 	}
-	_alt = p.GetInterpreter().AdaptivePredict(p.BaseParser, p.GetTokenStream(), 14, p.GetParserRuleContext())
+	_alt = p.GetInterpreter().AdaptivePredict(p.BaseParser, p.GetTokenStream(), 16, p.GetParserRuleContext())
 	if p.HasError() {
 		goto errorExit
 	}
@@ -1792,25 +2083,25 @@ func (p *Query) filterExpr(_p int) (localctx IFilterExprContext) {
 				p.TriggerExitRuleEvent()
 			}
 			_prevctx = localctx
-			p.SetState(114)
+			p.SetState(125)
 			p.GetErrorHandler().Sync(p)
 			if p.HasError() {
 				goto errorExit
 			}
 
-			switch p.GetInterpreter().AdaptivePredict(p.BaseParser, p.GetTokenStream(), 13, p.GetParserRuleContext()) {
+			switch p.GetInterpreter().AdaptivePredict(p.BaseParser, p.GetTokenStream(), 15, p.GetParserRuleContext()) {
 			case 1:
 				localctx = NewFilterExprContext(p, _parentctx, _parentState)
 				localctx.(*FilterExprContext).F1 = _prevctx
 				p.PushNewRecursionContext(localctx, _startState, QueryRULE_filterExpr)
-				p.SetState(108)
+				p.SetState(119)
 
 				if !(p.Precpred(p.GetParserRuleContext(), 4)) {
 					p.SetError(antlr.NewFailedPredicateException(p, "p.Precpred(p.GetParserRuleContext(), 4)", ""))
 					goto errorExit
 				}
 				{
-					p.SetState(109)
+					p.SetState(120)
 
 					var _m = p.Match(QueryAND_OP)
 
@@ -1821,7 +2112,7 @@ func (p *Query) filterExpr(_p int) (localctx IFilterExprContext) {
 					}
 				}
 				{
-					p.SetState(110)
+					p.SetState(121)
 
 					var _x = p.filterExpr(5)
 
@@ -1832,14 +2123,14 @@ func (p *Query) filterExpr(_p int) (localctx IFilterExprContext) {
 				localctx = NewFilterExprContext(p, _parentctx, _parentState)
 				localctx.(*FilterExprContext).F1 = _prevctx
 				p.PushNewRecursionContext(localctx, _startState, QueryRULE_filterExpr)
-				p.SetState(111)
+				p.SetState(122)
 
 				if !(p.Precpred(p.GetParserRuleContext(), 3)) {
 					p.SetError(antlr.NewFailedPredicateException(p, "p.Precpred(p.GetParserRuleContext(), 3)", ""))
 					goto errorExit
 				}
 				{
-					p.SetState(112)
+					p.SetState(123)
 
 					var _m = p.Match(QueryOR_OP)
 
@@ -1850,7 +2141,7 @@ func (p *Query) filterExpr(_p int) (localctx IFilterExprContext) {
 					}
 				}
 				{
-					p.SetState(113)
+					p.SetState(124)
 
 					var _x = p.filterExpr(4)
 
@@ -1862,12 +2153,12 @@ func (p *Query) filterExpr(_p int) (localctx IFilterExprContext) {
 			}
 
 		}
-		p.SetState(118)
+		p.SetState(129)
 		p.GetErrorHandler().Sync(p)
 		if p.HasError() {
 			goto errorExit
 		}
-		_alt = p.GetInterpreter().AdaptivePredict(p.BaseParser, p.GetTokenStream(), 14, p.GetParserRuleContext())
+		_alt = p.GetInterpreter().AdaptivePredict(p.BaseParser, p.GetTokenStream(), 16, p.GetParserRuleContext())
 		if p.HasError() {
 			goto errorExit
 		}
@@ -2017,10 +2308,10 @@ func (s *FilterStmtContext) Accept(visitor antlr.ParseTreeVisitor) interface{} {
 
 func (p *Query) FilterStmt() (localctx IFilterStmtContext) {
 	localctx = NewFilterStmtContext(p, p.GetParserRuleContext(), p.GetState())
-	p.EnterRule(localctx, 14, QueryRULE_filterStmt)
+	p.EnterRule(localctx, 16, QueryRULE_filterStmt)
 	p.EnterOuterAlt(localctx, 1)
 	{
-		p.SetState(119)
+		p.SetState(130)
 		p.Match(QueryFILTER)
 		if p.HasError() {
 			// Recognition error - abort rule
@@ -2028,14 +2319,14 @@ func (p *Query) FilterStmt() (localctx IFilterStmtContext) {
 		}
 	}
 	{
-		p.SetState(120)
+		p.SetState(131)
 
 		var _x = p.filterExpr(0)
 
 		localctx.(*FilterStmtContext).Expr = _x
 	}
 	{
-		p.SetState(121)
+		p.SetState(132)
 		p.Match(QueryAS)
 		if p.HasError() {
 			// Recognition error - abort rule
@@ -2043,7 +2334,7 @@ func (p *Query) FilterStmt() (localctx IFilterStmtContext) {
 		}
 	}
 	{
-		p.SetState(122)
+		p.SetState(133)
 
 		var _x = p.Ident()
 
@@ -2222,8 +2513,8 @@ func (s *ExprContext) Accept(visitor antlr.ParseTreeVisitor) interface{} {
 
 func (p *Query) Expr() (localctx IExprContext) {
 	localctx = NewExprContext(p, p.GetParserRuleContext(), p.GetState())
-	p.EnterRule(localctx, 16, QueryRULE_expr)
-	p.SetState(130)
+	p.EnterRule(localctx, 18, QueryRULE_expr)
+	p.SetState(141)
 	p.GetErrorHandler().Sync(p)
 	if p.HasError() {
 		goto errorExit
@@ -2233,7 +2524,7 @@ func (p *Query) Expr() (localctx IExprContext) {
 	case QueryAT:
 		p.EnterOuterAlt(localctx, 1)
 		{
-			p.SetState(124)
+			p.SetState(135)
 			p.Match(QueryAT)
 			if p.HasError() {
 				// Recognition error - abort rule
@@ -2241,7 +2532,7 @@ func (p *Query) Expr() (localctx IExprContext) {
 			}
 		}
 		{
-			p.SetState(125)
+			p.SetState(136)
 
 			var _x = p.Ident()
 
@@ -2251,14 +2542,14 @@ func (p *Query) Expr() (localctx IExprContext) {
 	case QueryREP, QueryIN, QueryAS, QuerySELECT, QueryFROM, QueryFILTER, QueryIDENT, QuerySTRING:
 		p.EnterOuterAlt(localctx, 2)
 		{
-			p.SetState(126)
+			p.SetState(137)
 
 			var _x = p.FilterKey()
 
 			localctx.(*ExprContext).Key = _x
 		}
 		{
-			p.SetState(127)
+			p.SetState(138)
 			p.Match(QuerySIMPLE_OP)
 			if p.HasError() {
 				// Recognition error - abort rule
@@ -2266,7 +2557,7 @@ func (p *Query) Expr() (localctx IExprContext) {
 			}
 		}
 		{
-			p.SetState(128)
+			p.SetState(139)
 
 			var _x = p.FilterValue()
 
@@ -2378,8 +2669,8 @@ func (s *FilterKeyContext) Accept(visitor antlr.ParseTreeVisitor) interface{} {
 
 func (p *Query) FilterKey() (localctx IFilterKeyContext) {
 	localctx = NewFilterKeyContext(p, p.GetParserRuleContext(), p.GetState())
-	p.EnterRule(localctx, 18, QueryRULE_filterKey)
-	p.SetState(134)
+	p.EnterRule(localctx, 20, QueryRULE_filterKey)
+	p.SetState(145)
 	p.GetErrorHandler().Sync(p)
 	if p.HasError() {
 		goto errorExit
@@ -2389,14 +2680,14 @@ func (p *Query) FilterKey() (localctx IFilterKeyContext) {
 	case QueryREP, QueryIN, QueryAS, QuerySELECT, QueryFROM, QueryFILTER, QueryIDENT:
 		p.EnterOuterAlt(localctx, 1)
 		{
-			p.SetState(132)
+			p.SetState(143)
 			p.Ident()
 		}
 
 	case QuerySTRING:
 		p.EnterOuterAlt(localctx, 2)
 		{
-			p.SetState(133)
+			p.SetState(144)
 			p.Match(QuerySTRING)
 			if p.HasError() {
 				// Recognition error - abort rule
@@ -2526,8 +2817,8 @@ func (s *FilterValueContext) Accept(visitor antlr.ParseTreeVisitor) interface{}
 
 func (p *Query) FilterValue() (localctx IFilterValueContext) {
 	localctx = NewFilterValueContext(p, p.GetParserRuleContext(), p.GetState())
-	p.EnterRule(localctx, 20, QueryRULE_filterValue)
-	p.SetState(139)
+	p.EnterRule(localctx, 22, QueryRULE_filterValue)
+	p.SetState(150)
 	p.GetErrorHandler().Sync(p)
 	if p.HasError() {
 		goto errorExit
@@ -2537,21 +2828,21 @@ func (p *Query) FilterValue() (localctx IFilterValueContext) {
 	case QueryREP, QueryIN, QueryAS, QuerySELECT, QueryFROM, QueryFILTER, QueryIDENT:
 		p.EnterOuterAlt(localctx, 1)
 		{
-			p.SetState(136)
+			p.SetState(147)
 			p.Ident()
 		}
 
 	case QueryNUMBER1, QueryZERO:
 		p.EnterOuterAlt(localctx, 2)
 		{
-			p.SetState(137)
+			p.SetState(148)
 			p.Number()
 		}
 
 	case QuerySTRING:
 		p.EnterOuterAlt(localctx, 3)
 		{
-			p.SetState(138)
+			p.SetState(149)
 			p.Match(QuerySTRING)
 			if p.HasError() {
 				// Recognition error - abort rule
@@ -2652,12 +2943,12 @@ func (s *NumberContext) Accept(visitor antlr.ParseTreeVisitor) interface{} {
 
 func (p *Query) Number() (localctx INumberContext) {
 	localctx = NewNumberContext(p, p.GetParserRuleContext(), p.GetState())
-	p.EnterRule(localctx, 22, QueryRULE_number)
+	p.EnterRule(localctx, 24, QueryRULE_number)
 	var _la int
 
 	p.EnterOuterAlt(localctx, 1)
 	{
-		p.SetState(141)
+		p.SetState(152)
 		_la = p.GetTokenStream().LA(1)
 
 		if !(_la == QueryNUMBER1 || _la == QueryZERO) {
@@ -2776,15 +3067,15 @@ func (s *KeywordContext) Accept(visitor antlr.ParseTreeVisitor) interface{} {
 
 func (p *Query) Keyword() (localctx IKeywordContext) {
 	localctx = NewKeywordContext(p, p.GetParserRuleContext(), p.GetState())
-	p.EnterRule(localctx, 24, QueryRULE_keyword)
+	p.EnterRule(localctx, 26, QueryRULE_keyword)
 	var _la int
 
 	p.EnterOuterAlt(localctx, 1)
 	{
-		p.SetState(143)
+		p.SetState(154)
 		_la = p.GetTokenStream().LA(1)
 
-		if !((int64(_la) & ^0x3f) == 0 && ((int64(1)<<_la)&7616) != 0) {
+		if !((int64(_la) & ^0x3f) == 0 && ((int64(1)<<_la)&15168) != 0) {
 			p.GetErrorHandler().RecoverInline(p)
 		} else {
 			p.GetErrorHandler().ReportMatch(p)
@@ -2892,8 +3183,8 @@ func (s *IdentContext) Accept(visitor antlr.ParseTreeVisitor) interface{} {
 
 func (p *Query) Ident() (localctx IIdentContext) {
 	localctx = NewIdentContext(p, p.GetParserRuleContext(), p.GetState())
-	p.EnterRule(localctx, 26, QueryRULE_ident)
-	p.SetState(147)
+	p.EnterRule(localctx, 28, QueryRULE_ident)
+	p.SetState(158)
 	p.GetErrorHandler().Sync(p)
 	if p.HasError() {
 		goto errorExit
@@ -2903,14 +3194,14 @@ func (p *Query) Ident() (localctx IIdentContext) {
 	case QueryREP, QueryIN, QueryAS, QuerySELECT, QueryFROM, QueryFILTER:
 		p.EnterOuterAlt(localctx, 1)
 		{
-			p.SetState(145)
+			p.SetState(156)
 			p.Keyword()
 		}
 
 	case QueryIDENT:
 		p.EnterOuterAlt(localctx, 2)
 		{
-			p.SetState(146)
+			p.SetState(157)
 			p.Match(QueryIDENT)
 			if p.HasError() {
 				// Recognition error - abort rule
@@ -3023,8 +3314,8 @@ func (s *IdentWCContext) Accept(visitor antlr.ParseTreeVisitor) interface{} {
 
 func (p *Query) IdentWC() (localctx IIdentWCContext) {
 	localctx = NewIdentWCContext(p, p.GetParserRuleContext(), p.GetState())
-	p.EnterRule(localctx, 28, QueryRULE_identWC)
-	p.SetState(151)
+	p.EnterRule(localctx, 30, QueryRULE_identWC)
+	p.SetState(162)
 	p.GetErrorHandler().Sync(p)
 	if p.HasError() {
 		goto errorExit
@@ -3034,14 +3325,14 @@ func (p *Query) IdentWC() (localctx IIdentWCContext) {
 	case QueryREP, QueryIN, QueryAS, QuerySELECT, QueryFROM, QueryFILTER, QueryIDENT:
 		p.EnterOuterAlt(localctx, 1)
 		{
-			p.SetState(149)
+			p.SetState(160)
 			p.Ident()
 		}
 
 	case QueryWILDCARD:
 		p.EnterOuterAlt(localctx, 2)
 		{
-			p.SetState(150)
+			p.SetState(161)
 			p.Match(QueryWILDCARD)
 			if p.HasError() {
 				// Recognition error - abort rule
@@ -3069,7 +3360,7 @@ errorExit:
 
 func (p *Query) Sempred(localctx antlr.RuleContext, ruleIndex, predIndex int) bool {
 	switch ruleIndex {
-	case 6:
+	case 7:
 		var t *FilterExprContext = nil
 		if localctx != nil {
 			t = localctx.(*FilterExprContext)
diff --git a/netmap/parser/query_visitor.go b/netmap/parser/query_visitor.go
index 7550d99..c251e90 100644
--- a/netmap/parser/query_visitor.go
+++ b/netmap/parser/query_visitor.go
@@ -1,4 +1,4 @@
-// Code generated from Query.g4 by ANTLR 4.13.0. DO NOT EDIT.
+// Code generated from /repo/frostfs/sdk-go/netmap/parser/Query.g4 by ANTLR 4.13.0. DO NOT EDIT.
 
 package parser // Query
 
@@ -14,6 +14,9 @@ type QueryVisitor interface {
 	// Visit a parse tree produced by Query#selectFilterExpr.
 	VisitSelectFilterExpr(ctx *SelectFilterExprContext) interface{}
 
+	// Visit a parse tree produced by Query#ecStmt.
+	VisitEcStmt(ctx *EcStmtContext) interface{}
+
 	// Visit a parse tree produced by Query#repStmt.
 	VisitRepStmt(ctx *RepStmtContext) interface{}
 
diff --git a/netmap/policy.go b/netmap/policy.go
index e28c89e..3ab77c2 100644
--- a/netmap/policy.go
+++ b/netmap/policy.go
@@ -34,8 +34,17 @@ type PlacementPolicy struct {
 
 func (p *PlacementPolicy) readFromV2(m netmap.PlacementPolicy, checkFieldPresence bool) error {
 	p.replicas = m.GetReplicas()
-	if checkFieldPresence && len(p.replicas) == 0 {
-		return errors.New("missing replicas")
+	if checkFieldPresence {
+		if len(p.replicas) == 0 {
+			return errors.New("missing replicas")
+		}
+		if len(p.replicas) != 1 {
+			for i := range p.replicas {
+				if p.replicas[i].GetECDataCount() != 0 || p.replicas[i].GetECParityCount() != 0 {
+					return errors.New("erasure code group must be used exclusively")
+				}
+			}
+		}
 	}
 
 	p.backupFactor = m.GetContainerBackupFactor()
@@ -393,10 +402,14 @@ func (p PlacementPolicy) WriteStringTo(w io.StringWriter) (err error) {
 		c := p.replicas[i].GetCount()
 		s := p.replicas[i].GetSelector()
 
-		if s != "" {
-			_, err = w.WriteString(fmt.Sprintf("%sREP %d IN %s", delim, c, s))
-		} else {
+		if c != 0 {
 			_, err = w.WriteString(fmt.Sprintf("%sREP %d", delim, c))
+		} else {
+			ecx, ecy := p.replicas[i].GetECDataCount(), p.replicas[i].GetECParityCount()
+			_, err = w.WriteString(fmt.Sprintf("%sEC %d.%d", delim, ecx, ecy))
+		}
+		if s != "" {
+			_, err = w.WriteString(fmt.Sprintf(" IN %s", s))
 		}
 
 		if err != nil {
@@ -630,6 +643,8 @@ var (
 		"make sure to pair REP and SELECT clauses: \"REP .. IN X\" + \"SELECT ... AS X\"")
 	// errRedundantSelector is returned for errors found by filters policy validator.
 	errRedundantFilter = errors.New("policy: found redundant filter")
+	// errECFewSelectors is returned when EC keyword is used without UNIQUE keyword.
+	errECFewSelectors = errors.New("policy: too few nodes to select")
 )
 
 type policyVisitor struct {
@@ -657,11 +672,18 @@ func (p *policyVisitor) VisitPolicy(ctx *parser.PolicyContext) any {
 
 	pl.unique = ctx.UNIQUE() != nil
 
-	repStmts := ctx.AllRepStmt()
-	pl.replicas = make([]netmap.Replica, 0, len(repStmts))
-
-	for _, r := range repStmts {
-		res, ok := r.Accept(p).(*netmap.Replica)
+	stmts := ctx.GetChildren()
+	for _, r := range stmts {
+		var res *netmap.Replica
+		var ok bool
+		switch r := r.(type) {
+		case parser.IRepStmtContext:
+			res, ok = r.Accept(p).(*netmap.Replica)
+		case parser.IEcStmtContext:
+			res, ok = r.Accept(p).(*netmap.Replica)
+		default:
+			continue
+		}
 		if !ok {
 			return nil
 		}
@@ -758,6 +780,28 @@ func (p *policyVisitor) VisitRepStmt(ctx *parser.RepStmtContext) any {
 	return rs
 }
 
+// VisitRepStmt implements parser.QueryVisitor interface.
+func (p *policyVisitor) VisitEcStmt(ctx *parser.EcStmtContext) any {
+	dataCount, err := strconv.ParseUint(ctx.GetData().GetText(), 10, 32)
+	if err != nil {
+		return p.reportError(errInvalidNumber)
+	}
+	parityCount, err := strconv.ParseUint(ctx.GetParity().GetText(), 10, 32)
+	if err != nil {
+		return p.reportError(errInvalidNumber)
+	}
+
+	rs := new(netmap.Replica)
+	rs.SetECDataCount(uint32(dataCount))
+	rs.SetECParityCount(uint32(parityCount))
+
+	if sel := ctx.GetSelector(); sel != nil {
+		rs.SetSelector(sel.GetText())
+	}
+
+	return rs
+}
+
 // VisitSelectStmt implements parser.QueryVisitor interface.
 func (p *policyVisitor) VisitSelectStmt(ctx *parser.SelectStmtContext) any {
 	res, err := strconv.ParseUint(ctx.GetCount().GetText(), 10, 32)
@@ -910,6 +954,14 @@ func validatePolicy(p PlacementPolicy) error {
 			if seenSelectors[selName] == nil {
 				return fmt.Errorf("%w: '%s'", errUnknownSelector, selName)
 			}
+
+			dataCount := p.replicas[i].GetECDataCount()
+			parityCount := p.replicas[i].GetECParityCount()
+			if dataCount != 0 || parityCount != 0 {
+				if c := seenSelectors[selName].GetCount(); c < dataCount+parityCount {
+					return fmt.Errorf("%w: %d < %d + %d", errECFewSelectors, c, dataCount, parityCount)
+				}
+			}
 		}
 	}
 
diff --git a/netmap/policy_decode_test.go b/netmap/policy_decode_test.go
index 0c78fa8..f42d3b5 100644
--- a/netmap/policy_decode_test.go
+++ b/netmap/policy_decode_test.go
@@ -44,6 +44,8 @@ FILTER Node EQ '10.78.8.11' AS F`,
 		`UNIQUE
 REP 1
 REP 1`,
+		`EC 1.2 IN X
+SELECT 3 IN City FROM * AS X`,
 	}
 
 	var p PlacementPolicy