You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by jh...@apache.org on 2017/01/03 08:42:44 UTC
[3/4] calcite git commit: Remove non-ASCII characters from Java
source files
Remove non-ASCII characters from Java source files
Project: http://git-wip-us.apache.org/repos/asf/calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/79da11fd
Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/79da11fd
Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/79da11fd
Branch: refs/heads/branch-1.11
Commit: 79da11fdee9285bd9432d26a2f5bd49ce3855b7d
Parents: 31d68f7
Author: Julian Hyde <jh...@apache.org>
Authored: Fri Dec 30 16:11:55 2016 -0800
Committer: Julian Hyde <jh...@apache.org>
Committed: Tue Jan 3 00:26:39 2017 -0800
----------------------------------------------------------------------
.../main/java/org/apache/calcite/avatica/SqlState.java | 6 +++---
.../org/apache/calcite/avatica/RemoteDriverTest.java | 3 ++-
.../java/org/apache/calcite/model/JsonJdbcSchema.java | 4 ++--
.../main/java/org/apache/calcite/model/JsonSchema.java | 4 ++--
.../org/apache/calcite/test/PigRelBuilderTest.java | 2 +-
.../org/apache/calcite/test/SqlToRelConverterTest.java | 13 +++++++------
6 files changed, 17 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/calcite/blob/79da11fd/avatica/core/src/main/java/org/apache/calcite/avatica/SqlState.java
----------------------------------------------------------------------
diff --git a/avatica/core/src/main/java/org/apache/calcite/avatica/SqlState.java b/avatica/core/src/main/java/org/apache/calcite/avatica/SqlState.java
index 01c714f..742fba5 100644
--- a/avatica/core/src/main/java/org/apache/calcite/avatica/SqlState.java
+++ b/avatica/core/src/main/java/org/apache/calcite/avatica/SqlState.java
@@ -24,11 +24,11 @@ import java.util.Map;
/**
* SQL error codes.
*
- * <p>Based upon Table 33 \u2014 SQLSTATE class and subclass values in SQL:2014 section 24.1, which is
- * as follows.
+ * <p>Based upon Table 33 &emdash; SQLSTATE class and subclass values in
+ * SQL:2014 section 24.1, which is as follows.
*
* <table border=1>
- * <caption>Table 33 \u2014 SQLSTATE class and subclass values</caption>
+ * <caption>Table 33 &emdash; SQLSTATE class and subclass values</caption>
* <tr>
* <th>Category</th>
* <th>Condition</th>
http://git-wip-us.apache.org/repos/asf/calcite/blob/79da11fd/avatica/server/src/test/java/org/apache/calcite/avatica/RemoteDriverTest.java
----------------------------------------------------------------------
diff --git a/avatica/server/src/test/java/org/apache/calcite/avatica/RemoteDriverTest.java b/avatica/server/src/test/java/org/apache/calcite/avatica/RemoteDriverTest.java
index 4f6a984..10bf85f 100644
--- a/avatica/server/src/test/java/org/apache/calcite/avatica/RemoteDriverTest.java
+++ b/avatica/server/src/test/java/org/apache/calcite/avatica/RemoteDriverTest.java
@@ -1458,7 +1458,8 @@ public class RemoteDriverTest {
@Test public void testUnicodeColumnNames() throws Exception {
final String tableName = "unicodeColumn";
- final String columnName = "\u041d\u043e\u043c\u0435\u0440\u0422\u0435\u043b\u0435\u0444\u043e\u043d\u0430"; // PhoneNumber in Russian
+ final String columnName = "\u041d\u043e\u043c\u0435\u0440\u0422\u0435\u043b"
+ + "\u0435\u0444\u043e\u043d\u0430"; // PhoneNumber in Russian
ConnectionSpec.getDatabaseLock().lock();
try (Connection conn = getLocalConnection();
Statement stmt = conn.createStatement()) {
http://git-wip-us.apache.org/repos/asf/calcite/blob/79da11fd/core/src/main/java/org/apache/calcite/model/JsonJdbcSchema.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/model/JsonJdbcSchema.java b/core/src/main/java/org/apache/calcite/model/JsonJdbcSchema.java
index 5eb203b..761dab5 100644
--- a/core/src/main/java/org/apache/calcite/model/JsonJdbcSchema.java
+++ b/core/src/main/java/org/apache/calcite/model/JsonJdbcSchema.java
@@ -32,7 +32,7 @@ public class JsonJdbcSchema extends JsonSchema {
*/
public String jdbcDriver;
- /** JDBC connect string, for example \u201cjdbc:mysql://localhost/foodmart\u201d.
+ /** JDBC connect string, for example "jdbc:mysql://localhost/foodmart".
*
* <p>Optional.
*/
@@ -44,7 +44,7 @@ public class JsonJdbcSchema extends JsonSchema {
*/
public String jdbcUser;
- /** JDBC connect string, for example \u201cjdbc:mysql://localhost/foodmart\u201d.
+ /** JDBC connect string, for example "jdbc:mysql://localhost/foodmart".
*
* <p>Optional.
*/
http://git-wip-us.apache.org/repos/asf/calcite/blob/79da11fd/core/src/main/java/org/apache/calcite/model/JsonSchema.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/model/JsonSchema.java b/core/src/main/java/org/apache/calcite/model/JsonSchema.java
index f9517e8..9a643c5 100644
--- a/core/src/main/java/org/apache/calcite/model/JsonSchema.java
+++ b/core/src/main/java/org/apache/calcite/model/JsonSchema.java
@@ -55,8 +55,8 @@ public abstract class JsonSchema {
*
* <blockquote><pre>path: [ ['usr', 'lib'], 'lib' ]</pre></blockquote>
*
- * <p>declares a path with two elements: the schema \u2018/usr/lib\u2019 and the schema
- * \u2018/lib\u2019. Most schemas are at the top level, and for these you can use a
+ * <p>declares a path with two elements: the schema '/usr/lib' and the schema
+ * '/lib'. Most schemas are at the top level, and for these you can use a
* string.
*/
public List<Object> path;
http://git-wip-us.apache.org/repos/asf/calcite/blob/79da11fd/core/src/test/java/org/apache/calcite/test/PigRelBuilderTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/calcite/test/PigRelBuilderTest.java b/core/src/test/java/org/apache/calcite/test/PigRelBuilderTest.java
index 38a3a3a..cc982cb 100644
--- a/core/src/test/java/org/apache/calcite/test/PigRelBuilderTest.java
+++ b/core/src/test/java/org/apache/calcite/test/PigRelBuilderTest.java
@@ -90,7 +90,7 @@ public class PigRelBuilderTest {
@Test public void testGroup() {
// Syntax:
// alias = GROUP alias { ALL | BY expression}
- // [, alias ALL | BY expression \u2026] [USING 'collected' | 'merge']
+ // [, alias ALL | BY expression ...] [USING 'collected' | 'merge']
// [PARTITION BY partitioner] [PARALLEL n];
// Equivalent to Pig Latin:
// r = GROUP e BY (deptno, job);
http://git-wip-us.apache.org/repos/asf/calcite/blob/79da11fd/core/src/test/java/org/apache/calcite/test/SqlToRelConverterTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/calcite/test/SqlToRelConverterTest.java b/core/src/test/java/org/apache/calcite/test/SqlToRelConverterTest.java
index 4c14c1c..32a2cbd 100644
--- a/core/src/test/java/org/apache/calcite/test/SqlToRelConverterTest.java
+++ b/core/src/test/java/org/apache/calcite/test/SqlToRelConverterTest.java
@@ -301,14 +301,15 @@ public class SqlToRelConverterTest extends SqlToRelTestBase {
}
/**
- * GROUP BY with duplicates
+ * GROUP BY with duplicates.
*
* <p>From SQL spec:
- * <blockquote>NOTE 190 \u2014 That is, a simple <em>group by clause</em> that is
- * not primitive may be transformed into a primitive <em>group by clause</em>
- * by deleting all parentheses, and deleting extra commas as necessary for
- * correct syntax. If there are no grouping columns at all (for example,
- * GROUP BY (), ()), this is transformed to the canonical form GROUP BY ().
+ * <blockquote>NOTE 190 &emdash; That is, a simple <em>group by clause</em>
+ * that is not primitive may be transformed into a primitive <em>group by
+ * clause</em> by deleting all parentheses, and deleting extra commas as
+ * necessary for correct syntax. If there are no grouping columns at all (for
+ * example, GROUP BY (), ()), this is transformed to the canonical form GROUP
+ * BY ().
* </blockquote> */
// Same effect as writing "GROUP BY ()"
@Test public void testGroupByWithDuplicates() {