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 2016/03/17 23:29:37 UTC
[2/3] calcite git commit: Fix javadoc errors
Fix javadoc errors
Project: http://git-wip-us.apache.org/repos/asf/calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/500e2dc9
Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/500e2dc9
Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/500e2dc9
Branch: refs/heads/branch-1.7
Commit: 500e2dc9f916e558a0dfaadde449436c4ed10425
Parents: 68a17fc
Author: Julian Hyde <jh...@apache.org>
Authored: Thu Mar 17 15:03:14 2016 -0700
Committer: Julian Hyde <jh...@apache.org>
Committed: Thu Mar 17 15:24:04 2016 -0700
----------------------------------------------------------------------
.../org/apache/calcite/examples/RelBuilderExample.java | 2 +-
.../test/java/org/apache/calcite/test/RexProgramTest.java | 4 ++--
.../concurrent/ConcurrentTestTimedCommandGenerator.java | 2 +-
site/_docs/howto.md | 10 ++++++----
4 files changed, 10 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/calcite/blob/500e2dc9/core/src/test/java/org/apache/calcite/examples/RelBuilderExample.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/calcite/examples/RelBuilderExample.java b/core/src/test/java/org/apache/calcite/examples/RelBuilderExample.java
index 12801e8..fcf6a52 100644
--- a/core/src/test/java/org/apache/calcite/examples/RelBuilderExample.java
+++ b/core/src/test/java/org/apache/calcite/examples/RelBuilderExample.java
@@ -118,7 +118,7 @@ public class RelBuilderExample {
* SELECT deptno, count(*) AS c, sum(sal) AS s
* FROM emp
* GROUP BY deptno
- * HAVING count(*) > 10</pre>
+ * HAVING count(*) > 10</pre>
*/
private RelBuilder example3(RelBuilder builder) {
return builder
http://git-wip-us.apache.org/repos/asf/calcite/blob/500e2dc9/core/src/test/java/org/apache/calcite/test/RexProgramTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/calcite/test/RexProgramTest.java b/core/src/test/java/org/apache/calcite/test/RexProgramTest.java
index ed56f90..9907959 100644
--- a/core/src/test/java/org/apache/calcite/test/RexProgramTest.java
+++ b/core/src/test/java/org/apache/calcite/test/RexProgramTest.java
@@ -284,10 +284,10 @@ public class RexProgramTest {
* <li><code>select (x + y) + (x + 1) as a, (x + (x + 1)) as b
* from t(x, y)</code>
* <li><code>select (x + y) + (x + 1) as a, (x + x) as b from t(x, y)
- * where ((x + y) > 1) and ((x + y) > 1)</code>
+ * where ((x + y) > 1) and ((x + y) > 1)</code>
* <li><code>select (x + y) + (x + 1) as a, (x + x) as b from t(x, y)
* where not case
- * when x + 1 > 5 then true
+ * when x + 1 > 5 then true
* when y is null then null
* else false
* end</code>
http://git-wip-us.apache.org/repos/asf/calcite/blob/500e2dc9/core/src/test/java/org/apache/calcite/test/concurrent/ConcurrentTestTimedCommandGenerator.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/calcite/test/concurrent/ConcurrentTestTimedCommandGenerator.java b/core/src/test/java/org/apache/calcite/test/concurrent/ConcurrentTestTimedCommandGenerator.java
index 15e177c..f2ee5a7 100644
--- a/core/src/test/java/org/apache/calcite/test/concurrent/ConcurrentTestTimedCommandGenerator.java
+++ b/core/src/test/java/org/apache/calcite/test/concurrent/ConcurrentTestTimedCommandGenerator.java
@@ -103,7 +103,7 @@ public class ConcurrentTestTimedCommandGenerator
/**
* TimedIterator is an Iterator that repeats a given collection's elements
- * until <code>System.currentTimeMillis() >= endTimeMillis</code>.
+ * until <code>System.currentTimeMillis() ≥ endTimeMillis</code>.
*/
private class TimedIterator<E> implements Iterator<E> {
private final List<E> commands;
http://git-wip-us.apache.org/repos/asf/calcite/blob/500e2dc9/site/_docs/howto.md
----------------------------------------------------------------------
diff --git a/site/_docs/howto.md b/site/_docs/howto.md
index 5954c33..f1fef65 100644
--- a/site/_docs/howto.md
+++ b/site/_docs/howto.md
@@ -429,10 +429,12 @@ Before you start:
* Check that `README` and `site/_docs/howto.md` have the correct version number.
* Set `version.major` and `version.minor` in `pom.xml`.
* Make sure build and tests succeed, including with `-P it,it-oracle`.
- Supported configurations are:
- * JDK 1.7, 1.8;
- * Linux, Mac OS X, and Windows;
- * Guava versions 12.0.1, 18.0 (the default) and 19.0 (specify `-Dguava.version=x.y`)
+* Make sure that `mvn javadoc:javadoc javadoc:test-javadoc` succeeds
+ (i.e. gives no errors; warnings are OK)
+* Decide the supported configurations of JDK, operating system and
+ Guava. These will probably be the same as those described in the
+ release notes of the previous release. Document them in the release
+ notes. To test Guava version x.y, specify `-Dguava.version=x.y`
* Optional extra tests:
* `-Dcalcite.test.db=mysql`
* `-Dcalcite.test.db=hsqldb`