Merge branch 'master' into jarodwen/features/positionvar
diff --git a/asterix-app/src/main/java/edu/uci/ics/asterix/aql/translator/AqlTranslator.java b/asterix-app/src/main/java/edu/uci/ics/asterix/aql/translator/AqlTranslator.java
index 1ec0937..e931271 100644
--- a/asterix-app/src/main/java/edu/uci/ics/asterix/aql/translator/AqlTranslator.java
+++ b/asterix-app/src/main/java/edu/uci/ics/asterix/aql/translator/AqlTranslator.java
@@ -174,7 +174,6 @@
IAWriterFactory writerFactory = PrinterBasedWriterFactory.INSTANCE;
IResultSerializerFactoryProvider resultSerializerFactoryProvider = ResultSerializerFactoryProvider.INSTANCE;
Map<String, String> config = new HashMap<String, String>();
- List<JobSpecification> jobsToExecute = new ArrayList<JobSpecification>();
for (Statement stmt : aqlStatements) {
validateOperation(activeDefaultDataverse, stmt);
@@ -183,7 +182,6 @@
metadataProvider.setResultSerializerFactoryProvider(resultSerializerFactoryProvider);
metadataProvider.setOutputFile(outputFile);
metadataProvider.setConfig(config);
- jobsToExecute.clear();
switch (stmt.getKind()) {
case SET: {
handleSetStatement(metadataProvider, stmt, config);
diff --git a/asterix-aql/src/main/javacc/AQL.jj b/asterix-aql/src/main/javacc/AQL.jj
index fdcd86e..fdbcc71 100644
--- a/asterix-aql/src/main/javacc/AQL.jj
+++ b/asterix-aql/src/main/javacc/AQL.jj
@@ -2109,17 +2109,17 @@
TOKEN:
{
- < DOUBLE_LITERAL: <INTEGER>
- | <INTEGER> ( "." <INTEGER> )?
- | "." <INTEGER>
+ < DOUBLE_LITERAL: <DIGITS>
+ | <DIGITS> ( "." <DIGITS> )?
+ | "." <DIGITS>
>
|
- < FLOAT_LITERAL: <INTEGER> ( "f" | "F" )
- | <INTEGER> ( "." <INTEGER> ( "f" | "F" ) )?
- | "." <INTEGER> ( "f" | "F" )
+ < FLOAT_LITERAL: <DIGITS> ( "f" | "F" )
+ | <DIGITS> ( "." <DIGITS> ( "f" | "F" ) )?
+ | "." <DIGITS> ( "f" | "F" )
>
|
- <INTEGER : (<DIGIT>)+ >
+ <DIGITS : (<DIGIT>)+ >
}
<DEFAULT>
@@ -2147,14 +2147,14 @@
<DEFAULT>
TOKEN :
{
- <IDENTIFIER : (<LETTER>)+ (<LETTER> | <DIGIT> | <SPECIALCHARS>)*>
+ <IDENTIFIER : <LETTER> (<LETTER> | <DIGIT> | <SPECIALCHARS>)*>
}
<DEFAULT>
TOKEN :
{
- <VARIABLE : "$" (<LETTER>)+ (<LETTER> | <DIGIT> | "_")* >
+ <VARIABLE : "$" <LETTER> (<LETTER> | <DIGIT> | "_")*>
}
SKIP:
diff --git a/pom.xml b/pom.xml
index 121b736..308900a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,8 +21,8 @@
<packaging>pom</packaging>
<properties>
- <algebricks.version>0.2.9-SNAPSHOT</algebricks.version>
- <hyracks.version>0.2.9-SNAPSHOT</hyracks.version>
+ <algebricks.version>0.2.10-SNAPSHOT</algebricks.version>
+ <hyracks.version>0.2.10-SNAPSHOT</hyracks.version>
</properties>
<build>