[calcite] branch master updated: Fix typos (Wang Yanlin)

[hy...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

hyuan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/calcite.git


The following commit(s) were added to refs/heads/master by this push:
     new 64c3957  Fix typos (Wang Yanlin)
64c3957 is described below

commit 64c395754d66e9a2ba6cd14e7ee0cb1eb5075c2c
Author: yanlin-Lynn <19...@163.com>
AuthorDate: Fri Oct 4 10:23:01 2019 +0800

    Fix typos (Wang Yanlin)
---
 core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcConvention.java  | 2 +-
 core/src/main/java/org/apache/calcite/jdbc/Driver.java                  | 2 +-
 core/src/main/java/org/apache/calcite/plan/ConventionTraitDef.java      | 2 +-
 .../java/org/apache/calcite/linq4j/tree/ClassDeclarationFinder.java     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcConvention.java b/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcConvention.java
index 670c6cd..71b7c59 100644
--- a/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcConvention.java
+++ b/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcConvention.java
@@ -39,7 +39,7 @@ import org.apache.calcite.sql.SqlDialect;
  * (That would involve asking database B to open a database link to database
  * A.)</p>
  *
- * <p>As a result, converter rules from and two this convention need to be
+ * <p>As a result, converter rules from and to this convention need to be
  * instantiated, at the start of planning, for each JDBC database in play.</p>
  */
 public class JdbcConvention extends Convention.Impl {
diff --git a/core/src/main/java/org/apache/calcite/jdbc/Driver.java b/core/src/main/java/org/apache/calcite/jdbc/Driver.java
index 09e4d93..1840ed7 100644
--- a/core/src/main/java/org/apache/calcite/jdbc/Driver.java
+++ b/core/src/main/java/org/apache/calcite/jdbc/Driver.java
@@ -81,7 +81,7 @@ public class Driver extends UnregisteredDriver {
     }
   }
 
-  protected DriverVersion createDriverVersion() {
+  @Override protected DriverVersion createDriverVersion() {
     return DriverVersion.load(
         Driver.class,
         "org-apache-calcite-jdbc.properties",
diff --git a/core/src/main/java/org/apache/calcite/plan/ConventionTraitDef.java b/core/src/main/java/org/apache/calcite/plan/ConventionTraitDef.java
index ff9de80..cc459b3 100644
--- a/core/src/main/java/org/apache/calcite/plan/ConventionTraitDef.java
+++ b/core/src/main/java/org/apache/calcite/plan/ConventionTraitDef.java
@@ -34,7 +34,7 @@ import com.google.common.collect.Multimap;
 import java.util.List;
 
 /**
- * Definition of the the convention trait.
+ * Definition of the convention trait.
  * A new set of conversion information is created for
  * each planner that registers at least one {@link ConverterRule} instance.
  *
diff --git a/linq4j/src/main/java/org/apache/calcite/linq4j/tree/ClassDeclarationFinder.java b/linq4j/src/main/java/org/apache/calcite/linq4j/tree/ClassDeclarationFinder.java
index f21e241..2e69e49 100644
--- a/linq4j/src/main/java/org/apache/calcite/linq4j/tree/ClassDeclarationFinder.java
+++ b/linq4j/src/main/java/org/apache/calcite/linq4j/tree/ClassDeclarationFinder.java
@@ -24,7 +24,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
- * Entry point for optimizers that factor ou deterministic expressions to
+ * Entry point for optimizers that factor out deterministic expressions to
  * final static fields.
  * Instances of this class should not be reused, so new visitor should be
  * created for optimizing a new expression tree.