You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by ma...@apache.org on 2014/02/12 06:31:53 UTC
git commit: Fix parser compilation warnings
Updated Branches:
refs/heads/master 872acf6a5 -> a8e4dd77c
Fix parser compilation warnings
Project: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/commit/a8e4dd77
Tree: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/tree/a8e4dd77
Diff: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/diff/a8e4dd77
Branch: refs/heads/master
Commit: a8e4dd77cb72a975e042406a45b973db17f85bbc
Parents: 872acf6
Author: maryannxue <ma...@apache.org>
Authored: Wed Feb 12 00:31:34 2014 -0500
Committer: maryannxue <ma...@apache.org>
Committed: Wed Feb 12 00:31:34 2014 -0500
----------------------------------------------------------------------
phoenix-core/src/main/antlr3/PhoenixSQL.g | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/a8e4dd77/phoenix-core/src/main/antlr3/PhoenixSQL.g
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/antlr3/PhoenixSQL.g b/phoenix-core/src/main/antlr3/PhoenixSQL.g
index 20b6fa2..f28b28a 100644
--- a/phoenix-core/src/main/antlr3/PhoenixSQL.g
+++ b/phoenix-core/src/main/antlr3/PhoenixSQL.g
@@ -600,7 +600,7 @@ select_list returns [List<AliasedNode> ret]
selectable returns [AliasedNode ret]
: field=expression (a=parseAlias)? { $ret = factory.aliasedNode(a, field); }
| familyName=identifier DOT ASTERISK { $ret = factory.aliasedNode(null, factory.family(familyName));} // i.e. the 'cf.*' in 'select cf.* from' cf being column family of an hbase table
- | tableName=table_name DOT ASTERISK { $ret = factory.aliasedNode(null, factory.tableWildcard(tableName)); }
+ | s=identifier DOT t=identifier DOT ASTERISK { $ret = factory.aliasedNode(null, factory.tableWildcard(factory.table(s, t))); }
;