changed name of local variable primaryKey to primaryKeyFields
git-svn-id: https://asterixdb.googlecode.com/svn/branches/asterix_stabilization_issue_252_253@1187 eaa15691-b419-025a-1212-ee371bd00084
diff --git a/asterix-aql/src/main/javacc/AQL.jj b/asterix-aql/src/main/javacc/AQL.jj
index 0d797a1..78d1129 100644
--- a/asterix-aql/src/main/javacc/AQL.jj
+++ b/asterix-aql/src/main/javacc/AQL.jj
@@ -740,13 +740,13 @@
InternalDetailsDecl InternalDatasetDeclaration() throws ParseException :
{
InternalDetailsDecl idd = null;
- List<String> primaryKey = new ArrayList<String>();
+ List<String> primaryKeyFields = new ArrayList<String>();
Identifier nodeGroupName=null;
}
{
(
{
- primaryKey = getPrimaryKey();
+ primaryKeyFields = getPrimaryKeyFields();
}
)
@@ -758,7 +758,7 @@
)?
{
- idd = new InternalDetailsDecl(nodeGroupName, primaryKey);
+ idd = new InternalDetailsDecl(nodeGroupName, primaryKeyFields);
return idd;
}
}
@@ -800,7 +800,7 @@
String adapterName = null;
Map < String, String > properties;
Pair<Identifier,Identifier> nameComponents;
- List<String> primaryKey = new ArrayList<String>();
+ List<String> primaryKeyFields = new ArrayList<String>();
Identifier nodeGroupName=null;
FunctionSignature appliedFunction=null;
String dataverse;
@@ -836,7 +836,7 @@
(
{
- primaryKey = getPrimaryKey();
+ primaryKeyFields = getPrimaryKeyFields();
}
)
@@ -848,30 +848,30 @@
)?
{
- fdd = new FeedDetailsDecl(adapterName, properties, appliedFunction, nodeGroupName, primaryKey);
+ fdd = new FeedDetailsDecl(adapterName, properties, appliedFunction, nodeGroupName, primaryKeyFields);
return fdd;
}
}
-List<String> getPrimaryKey() throws ParseException :
+List<String> getPrimaryKeyFields() throws ParseException :
{
- List<String> primaryKey = new ArrayList<String>();
+ List<String> primaryKeyFields = new ArrayList<String>();
}
{
"primary" "key"
< IDENTIFIER >
{
- primaryKey.add(token.image);
+ primaryKeyFields.add(token.image);
}
(
"," < IDENTIFIER >
{
- primaryKey.add(token.image);
+ primaryKeyFields.add(token.image);
}
)*
{
- return primaryKey;
+ return primaryKeyFields;
}
}