Query: Adds Antlr dependency for local parsing optimization on non-Wi…

…ndows x64 systems (#1743) * Revert "Internal Query : Fix Remove Antlr dependency for now (#1626)" This reverts commit ed7faae. * added test for antlr dependancy Co-authored-by: j82w <j82w@users.noreply.github.com>
Azure · Aug 13, 2020 · 985b518 · 985b518
1 parent d8d56e6
commit 985b518
Show file tree

Hide file tree

Showing 12 changed files with 50 additions and 68 deletions.
diff --git a/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.csproj b/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.csproj
@@ -83,6 +83,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="Antlr4.Runtime.Standard" Version="4.8.0" />
     <PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
     <PackageReference Include="Newtonsoft.Json" Version="10.0.2" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="All" />

diff --git a/Microsoft.Azure.Cosmos/src/Query/Core/Parser/CstToAstVisitor.cs b/Microsoft.Azure.Cosmos/src/Query/Core/Parser/CstToAstVisitor.cs
@@ -4,7 +4,6 @@
 
 namespace Microsoft.Azure.Cosmos.Query.Core.Parser
 {
-#if false
     using System;
     using System.Collections.Generic;
     using Antlr4.Runtime.Tree;
@@ -127,7 +126,7 @@ public override SqlObject VisitSql_query(sqlParser.Sql_queryContext context)
                 sqlOffsetLimitClause);
         }
 
-    #region SELECT
+        #region SELECT
         public override SqlObject VisitSelect_clause(sqlParser.Select_clauseContext context)
         {
             SqlSelectSpec sqlSelectSpec = (SqlSelectSpec)this.Visit(context.selection());
@@ -201,8 +200,8 @@ public override SqlObject VisitTop_spec(sqlParser.Top_specContext context)
             Number64 topCount = CstToAstVisitor.GetNumber64ValueFromNode(context.NUMERIC_LITERAL());
             return SqlTopSpec.Create(SqlNumberLiteral.Create(topCount));
         }
-    #endregion
-    #region FROM
+        #endregion
+        #region FROM
         public override SqlObject VisitFrom_clause(sqlParser.From_clauseContext context)
         {
             Contract.Requires(context != null);
@@ -311,16 +310,16 @@ public override SqlObject VisitStringPathExpression(sqlParser.StringPathExpressi
 
             return SqlStringPathExpression.Create(pathExpression, stringIndex);
         }
-    #endregion
-    #region WHERE
+        #endregion
+        #region WHERE
         public override SqlObject VisitWhere_clause(sqlParser.Where_clauseContext context)
         {
             Contract.Requires(context != null);
             SqlScalarExpression sqlScalarExpression = (SqlScalarExpression)this.Visit(context.scalar_expression());
             return SqlWhereClause.Create(sqlScalarExpression);
         }
-    #endregion
-    #region GROUP BY
+        #endregion
+        #region GROUP BY
         public override SqlObject VisitGroup_by_clause(sqlParser.Group_by_clauseContext context)
         {
             Contract.Requires(context != null);
@@ -333,8 +332,8 @@ public override SqlObject VisitGroup_by_clause(sqlParser.Group_by_clauseContext
 
             return SqlGroupByClause.Create(groupByColumns);
         }
-    #endregion
-    #region ORDER BY
+        #endregion
+        #region ORDER BY
         public override SqlObject VisitOrder_by_clause(sqlParser.Order_by_clauseContext context)
         {
             Contract.Requires(context != null);
@@ -366,8 +365,8 @@ public override SqlObject VisitOrder_by_clause(sqlParser.Order_by_clauseContext
 
             return SqlOrderbyClause.Create(orderByItems);
         }
-    #endregion
-    #region OFFSET LIMIT
+        #endregion
+        #region OFFSET LIMIT
         public override SqlObject VisitOffset_limit_clause(sqlParser.Offset_limit_clauseContext context)
         {
             Contract.Requires(context != null);
@@ -384,8 +383,8 @@ public override SqlObject VisitOffset_limit_clause(sqlParser.Offset_limit_clause
 
             return SqlOffsetLimitClause.Create(sqlOffsetSpec, sqlLimitSpec);
         }
-    #endregion
-    #region ScalarExpressions
+        #endregion
+        #region ScalarExpressions
         public override SqlObject VisitArrayCreateScalarExpression(sqlParser.ArrayCreateScalarExpressionContext context)
         {
             Contract.Requires(context != null);
@@ -638,9 +637,9 @@ public override SqlObject VisitUnaryScalarExpression(sqlParser.UnaryScalarExpres
 
             return SqlUnaryScalarExpression.Create(unaryOperator, expression);
         }
-    #endregion
+        #endregion
 
-    #region NOT IMPLEMENTED ON PURPOSE
+        #region NOT IMPLEMENTED ON PURPOSE
         public override SqlObject VisitBinary_operator(sqlParser.Binary_operatorContext context)
         {
             throw new NotSupportedException();
@@ -690,7 +689,7 @@ public override SqlObject VisitScalar_expression_list(sqlParser.Scalar_expressio
         {
             throw new NotSupportedException();
         }
-    #endregion
+        #endregion
 
         private sealed class UnknownSqlObjectException : ArgumentOutOfRangeException
         {
@@ -725,5 +724,4 @@ private static Number64 GetNumber64ValueFromNode(IParseTree parseTree)
             return number64;
         }
     }
-#endif
 }
diff --git a/Microsoft.Azure.Cosmos/src/Query/Core/Parser/ErrorListener.cs b/Microsoft.Azure.Cosmos/src/Query/Core/Parser/ErrorListener.cs
@@ -6,7 +6,6 @@
 
 namespace Microsoft.Azure.Cosmos.Query.Core.Parser
 {
-    #if false
     using System;
     using System.Collections.Generic;
     using System.IO;
@@ -67,5 +66,4 @@ public ErrorListener(Parser parser, Lexer lexer, CommonTokenStream token_stream)
             base.SyntaxError(output, recognizer, offendingSymbol, line, col, msg, e);
         }
     }
-#endif
 }
diff --git a/Microsoft.Azure.Cosmos/src/Query/Core/Parser/IsqlListener.cs b/Microsoft.Azure.Cosmos/src/Query/Core/Parser/IsqlListener.cs
@@ -21,7 +21,6 @@
 
 namespace Microsoft.Azure.Cosmos.Query.Core.Parser
 {
-    #if false
     using Antlr4.Runtime.Misc;
     using IParseTreeListener = Antlr4.Runtime.Tree.IParseTreeListener;
 
@@ -583,5 +582,4 @@ internal interface IsqlListener : IParseTreeListener
         /// <param name="context">The parse tree.</param>
         void ExitLiteral([NotNull] sqlParser.LiteralContext context);
     }
-#endif
 }
diff --git a/Microsoft.Azure.Cosmos/src/Query/Core/Parser/IsqlVisitor.cs b/Microsoft.Azure.Cosmos/src/Query/Core/Parser/IsqlVisitor.cs
@@ -21,7 +21,6 @@
 
 namespace Microsoft.Azure.Cosmos.Query.Core.Parser
 {
-    #if false
     using Antlr4.Runtime.Misc;
     using Antlr4.Runtime.Tree;
     using IToken = Antlr4.Runtime.IToken;
@@ -360,5 +359,4 @@ internal interface IsqlVisitor<Result> : IParseTreeVisitor<Result>
         /// <return>The visitor result.</return>
         Result VisitLiteral([NotNull] sqlParser.LiteralContext context);
     }
-#endif
 }
diff --git a/Microsoft.Azure.Cosmos/src/Query/Core/Parser/LASets.cs b/Microsoft.Azure.Cosmos/src/Query/Core/Parser/LASets.cs
@@ -6,7 +6,6 @@
 
 namespace Microsoft.Azure.Cosmos.Query.Core.Parser
 {
-#if false
     using System;
     using System.Collections.Generic;
     using System.Diagnostics;
@@ -18,7 +17,6 @@ namespace Microsoft.Azure.Cosmos.Query.Core.Parser
 
     internal class LASets
     {
-
         private readonly Dictionary<Pair<ATNState, int>, bool> visited = new Dictionary<Pair<ATNState, int>, bool>();
         private readonly bool logParse = false;
         private readonly bool logClosure = false;
@@ -797,5 +795,4 @@ private string PrintResult(List<List<Edge>> all_parses)
             return sb.ToString();
         }
     }
-#endif
 }
diff --git a/Microsoft.Azure.Cosmos/src/Query/Core/Parser/sqlBaseVisitor.cs b/Microsoft.Azure.Cosmos/src/Query/Core/Parser/sqlBaseVisitor.cs
@@ -21,7 +21,6 @@
 
 namespace Microsoft.Azure.Cosmos.Query.Core.Parser
 {
-    #if false
     using Antlr4.Runtime.Misc;
     using Antlr4.Runtime.Tree;
 
@@ -563,5 +562,4 @@ internal partial class sqlBaseVisitor<Result> : AbstractParseTreeVisitor<Result>
         /// <return>The visitor result.</return>
         public virtual Result VisitLiteral([NotNull] sqlParser.LiteralContext context) { return VisitChildren(context); }
     }
-#endif
 }
diff --git a/Microsoft.Azure.Cosmos/src/Query/Core/Parser/sqlLexer.cs b/Microsoft.Azure.Cosmos/src/Query/Core/Parser/sqlLexer.cs
@@ -21,7 +21,6 @@
 
 namespace Microsoft.Azure.Cosmos.Query.Core.Parser
 {
-    #if false
     using System;
     using System.IO;
     using Antlr4.Runtime;
@@ -563,5 +562,4 @@ static sqlLexer()
         public static readonly ATN _ATN =
             new ATNDeserializer().Deserialize(_serializedATN);
     }
-#endif
 }
diff --git a/Microsoft.Azure.Cosmos/src/Query/Core/Parser/sqlParser.cs b/Microsoft.Azure.Cosmos/src/Query/Core/Parser/sqlParser.cs
@@ -21,7 +21,6 @@
 
 namespace Microsoft.Azure.Cosmos.Query.Core.Parser
 {
-    #if false
     using System;
     using System.IO;
     using Antlr4.Runtime;
@@ -3326,5 +3325,4 @@ private bool scalar_expression_sempred(Scalar_expressionContext _localctx, int p
         public static readonly ATN _ATN =
             new ATNDeserializer().Deserialize(_serializedATN);
     }
-#endif
-}
+}
diff --git a/Microsoft.Azure.Cosmos/src/SqlObjects/SqlQuery.cs b/Microsoft.Azure.Cosmos/src/SqlObjects/SqlQuery.cs
@@ -5,10 +5,8 @@ namespace Microsoft.Azure.Cosmos.SqlObjects
 {
     using System;
     using System.Runtime.ExceptionServices;
-#if false
     using Antlr4.Runtime;
     using Antlr4.Runtime.Misc;
-#endif
     using Microsoft.Azure.Cosmos.Query.Core.Parser;
     using Microsoft.Azure.Cosmos.SqlObjects.Visitors;
 
@@ -76,7 +74,6 @@ public static bool TryParse(string text, out SqlQuery sqlQuery)
                 throw new ArgumentNullException(nameof(text));
             }
 
-#if false
             AntlrInputStream str = new AntlrInputStream(text);
             sqlLexer lexer = new sqlLexer(str);
             CommonTokenStream tokens = new CommonTokenStream(lexer);
@@ -106,13 +103,8 @@ public static bool TryParse(string text, out SqlQuery sqlQuery)
 
             sqlQuery = (SqlQuery)CstToAstVisitor.Singleton.Visit(programContext);
             return true;
-#else
-            sqlQuery = default;
-            return false;
-#endif
         }
 
-#if false
         private sealed class ThrowExceptionOnErrors : IAntlrErrorStrategy
         {
             public static readonly ThrowExceptionOnErrors Singleton = new ThrowExceptionOnErrors();
@@ -153,6 +145,5 @@ public void Sync(Parser recognizer)
                 // Do nothing
             }
         }
-#endif
     }
 }
diff --git a/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/Query/SanityQueryTests.cs b/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/Query/SanityQueryTests.cs
@@ -675,12 +675,10 @@ async Task<List<CosmosElement>> AssertPassthroughAsync(string query, Cosmos.Part
                                     Assert.IsTrue(feedOptions.TestSettings.Stats.PipelineType.HasValue);
                                     Assert.AreEqual(TestInjections.PipelineType.Passthrough, feedOptions.TestSettings.Stats.PipelineType.Value);
 
-#if false
                                     if (pk.HasValue)
                                     {
                                         Assert.AreEqual(0, cosmosQueryClientCore.QueryPlanCalls);
                                     }
-#endif
 
                                     return queryResults;
                                 }