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 2015/11/17 22:57:19 UTC
calcite git commit: [CALCITE-979] Broken links in web site
Repository: calcite
Updated Branches:
refs/heads/master c78092454 -> 8cd8ad925
[CALCITE-979] Broken links in web site
Project: http://git-wip-us.apache.org/repos/asf/calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/8cd8ad92
Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/8cd8ad92
Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/8cd8ad92
Branch: refs/heads/master
Commit: 8cd8ad9259bbab48b8794e6033eafddc2d611698
Parents: c780924
Author: Julian Hyde <jh...@apache.org>
Authored: Tue Nov 17 13:55:58 2015 -0800
Committer: Julian Hyde <jh...@apache.org>
Committed: Tue Nov 17 13:55:58 2015 -0800
----------------------------------------------------------------------
.../main/java/org/apache/calcite/model/package-info.java | 2 +-
.../java/org/apache/calcite/rel/rules/package-info.java | 6 +++---
site/_docs/algebra.md | 10 +++++-----
site/_docs/history.md | 9 +++++----
site/_docs/howto.md | 2 +-
site/_docs/index.md | 2 +-
site/_docs/lattice.md | 2 +-
site/_docs/model.md | 11 +++++++----
8 files changed, 24 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/calcite/blob/8cd8ad92/core/src/main/java/org/apache/calcite/model/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/model/package-info.java b/core/src/main/java/org/apache/calcite/model/package-info.java
index 3541c27..d7cbed7 100644
--- a/core/src/main/java/org/apache/calcite/model/package-info.java
+++ b/core/src/main/java/org/apache/calcite/model/package-info.java
@@ -31,7 +31,7 @@
* interfaces and including a custom schema in the model.</p>
*
* <p>There are several examples of schemas in the
- * <a href="https://github.com/apache/calcite/blob/master/doc/tutorial.md">tutorial</a>.
+ * <a href="https://calcite.apache.org/docs/tutorial.html">tutorial</a>.
*/
@PackageMarker
package org.apache.calcite.model;
http://git-wip-us.apache.org/repos/asf/calcite/blob/8cd8ad92/core/src/main/java/org/apache/calcite/rel/rules/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/package-info.java b/core/src/main/java/org/apache/calcite/rel/rules/package-info.java
index 4f9d8bd..54b1e57 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/package-info.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/package-info.java
@@ -36,13 +36,13 @@
*
* <h2>Related packages and classes</h2>
* <ul>
- * <li>Package<code> <a href="../sql/package-summary.html">
+ * <li>Package<code> <a href="../../sql/package-summary.html">
* org.apache.calcite.sql</a></code>
* is an object model for SQL expressions</li>
- * <li>Package<code> <a href="../rex/package-summary.html">
+ * <li>Package<code> <a href="../../rex/package-summary.html">
* org.apache.calcite.rex</a></code>
* is an object model for relational row expressions</li>
- * <li>Package<code> <a href="../plan/package-summary.html">
+ * <li>Package<code> <a href="../../plan/package-summary.html">
* org.apache.calcite.plan</a></code>
* provides an optimizer interface.</li>
* </ul>
http://git-wip-us.apache.org/repos/asf/calcite/blob/8cd8ad92/site/_docs/algebra.md
----------------------------------------------------------------------
diff --git a/site/_docs/algebra.md b/site/_docs/algebra.md
index e77edb0..e651dd0 100644
--- a/site/_docs/algebra.md
+++ b/site/_docs/algebra.md
@@ -285,9 +285,9 @@ Argument types:
* `fieldName...` Array of String
* `fieldNames` Iterable of String
* `rowType` [RelDataType]({{ site.apiRoot }}/org/apache/calcite/rel/type/RelDataType.html)
-* `groupKey` [RelBuilder.GroupKey]({{ site.apiRoot }}/org/apache/calcite/tools/RelBuilder/GroupKey.html)
-* `aggCall...` Array of [RelBuilder.AggCall]({{ site.apiRoot }}/org/apache/calcite/tools/RelBuilder/AggCall.html)
-* `aggCallList` Iterable of [RelBuilder.AggCall]({{ site.apiRoot }}/org/apache/calcite/tools/RelBuilder/AggCall.html)
+* `groupKey` [RelBuilder.GroupKey]({{ site.apiRoot }}/org/apache/calcite/tools/RelBuilder.GroupKey.html)
+* `aggCall...` Array of [RelBuilder.AggCall]({{ site.apiRoot }}/org/apache/calcite/tools/RelBuilder.AggCall.html)
+* `aggCallList` Iterable of [RelBuilder.AggCall]({{ site.apiRoot }}/org/apache/calcite/tools/RelBuilder.AggCall.html)
* `value...` Array of Object
* `value` Object
* `tupleList` Iterable of List of [RexLiteral]({{ site.apiRoot }}/org/apache/calcite/rex/RexLiteral.html)
@@ -346,7 +346,7 @@ added to the stack.
### Group key methods
The following methods return a
-[RelBuilder.GroupKey]({{ site.apiRoot }}/org/apache/calcite/tools/RelBuilder/GroupKey.html).
+[RelBuilder.GroupKey]({{ site.apiRoot }}/org/apache/calcite/tools/RelBuilder.GroupKey.html).
| Method | Description
|:------------------- |:-----------
@@ -357,7 +357,7 @@ The following methods return a
### Aggregate call methods
The following methods return an
-[RelBuilder.AggCall]({{ site.apiRoot }}/org/apache/calcite/tools/RelBuilder/AggCall.html).
+[RelBuilder.AggCall]({{ site.apiRoot }}/org/apache/calcite/tools/RelBuilder.AggCall.html).
| Method | Description
|:------------------- |:-----------
http://git-wip-us.apache.org/repos/asf/calcite/blob/8cd8ad92/site/_docs/history.md
----------------------------------------------------------------------
diff --git a/site/_docs/history.md b/site/_docs/history.md
index b746cc7..00a4cbb 100644
--- a/site/_docs/history.md
+++ b/site/_docs/history.md
@@ -1455,7 +1455,7 @@ New features
* Fix return type inference for aggregate calls. If the `GROUP BY` clause is
empty, `SUM` may return null.
* [<a href="https://issues.apache.org/jira/browse/CALCITE-37">CALCITE-37</a>]
- Document JSON model file format (as <a href="model.md">model.md</a>).
+ Document JSON model file format (as <a href="{{ site.sourceRoot }}/site/_docs/model.md">model.md</a>).
* [<a href="https://issues.apache.org/jira/browse/CALCITE-238">CALCITE-238</a>]
Add adapter that generates TPC-H data
* Improve exception message in `AvaticaConnection`; add
@@ -1917,7 +1917,8 @@ Other
materializations and end-user queries are canonized in terms of star tables.
Matching (not done yet) will then be a matter of looking for sort, groupBy,
project. It is not yet possible to define a star in an Optiq model file.
-* Add section to <a href="howto.md">HOWTO</a> on implementing adapters.
+* Add section to <a href="{{ site.sourceRoot }}/site/_docs/howto.md">HOWTO</a>
+ on implementing adapters.
* Fix data type conversions when creating a clone table in memory.
* Fix how strings are escaped in JsonBuilder.
* Test suite now depends on an embedded hsqldb database, so you can run
@@ -1949,8 +1950,8 @@ Other
{: #v0-4-15}
* Lots of good stuff that this margin is too small to contain. See
- <a href="reference.md">SQL language reference</a> and
- <a href="model.md">JSON model reference</a>.
+ <a href="{{ site.sourceRoot }}/site/_docs/reference.md">SQL language reference</a> and
+ <a href="{{ site.sourceRoot }}/site/_docs/model.md">JSON model reference</a>.
# Optiq-csv release history
http://git-wip-us.apache.org/repos/asf/calcite/blob/8cd8ad92/site/_docs/howto.md
----------------------------------------------------------------------
diff --git a/site/_docs/howto.md b/site/_docs/howto.md
index 8b55b55..c741174 100644
--- a/site/_docs/howto.md
+++ b/site/_docs/howto.md
@@ -739,7 +739,7 @@ The old releases will remain available in the
[release archive](http://archive.apache.org/dist/calcite/).
Add a release note by copying
-[site/_posts/2015-xx-xx-release-1.5.0.md]({{ site.sourceRoot }}/site/_posts/2015-xx-xx-release-1.5.0.md),
+[site/_posts/2015-11-10-release-1.5.0.md]({{ site.sourceRoot }}/site/_posts/2015-11-10-release-1.5.0.md),
[publish the site](#publish-the-web-site),
and check that it appears in the contents in [news](http://localhost:4000/news/).
http://git-wip-us.apache.org/repos/asf/calcite/blob/8cd8ad92/site/_docs/index.md
----------------------------------------------------------------------
diff --git a/site/_docs/index.md b/site/_docs/index.md
index 58d2ef4..f0c4afd 100644
--- a/site/_docs/index.md
+++ b/site/_docs/index.md
@@ -116,7 +116,7 @@ The subproject under example/csv provides a CSV adapter, which is
fully functional for use in applications but is also simple enough to
serve as a good template if you are writing your own adapter.
-See the <a href="{{ site.baseurl }}/tutorial.html">tutorial</a> for information on using
+See the <a href="{{ site.baseurl }}/docs/tutorial.html">tutorial</a> for information on using
the CSV adapter and writing other adapters.
See the <a href="howto.html">HOWTO</a> for more information about
http://git-wip-us.apache.org/repos/asf/calcite/blob/8cd8ad92/site/_docs/lattice.md
----------------------------------------------------------------------
diff --git a/site/_docs/lattice.md b/site/_docs/lattice.md
index aef5201..918261c 100644
--- a/site/_docs/lattice.md
+++ b/site/_docs/lattice.md
@@ -116,7 +116,7 @@ Examples:
A "tile" is a materialized table in a lattice, with a particular
dimensionality. (What Kylin calls a "cuboid".) The "tiles" attribute
-of the <a href="{{ site.baseurl }}/model.html#lattice">lattice JSON element</a>
+of the <a href="{{ site.baseurl }}/docs/model.html#lattice">lattice JSON element</a>
defines an initial set of tiles to materialize.
If you run the algorithm, you can omit the tiles attribute. Calcite
http://git-wip-us.apache.org/repos/asf/calcite/blob/8cd8ad92/site/_docs/model.md
----------------------------------------------------------------------
diff --git a/site/_docs/model.md b/site/_docs/model.md
index 4017a92..2675453 100644
--- a/site/_docs/model.md
+++ b/site/_docs/model.md
@@ -439,15 +439,18 @@ just 'count(*)':
`statisticProvider` (optional name of a class that implements
[org.apache.calcite.materialize.LatticeStatisticProvider]({{ site.apiRoot }}/org/apache/calcite/materialize/LatticeStatisticProvider.html))
-is provides estimates of the number of distinct values * in each column.
+provides estimates of the number of distinct values in each column.
-You can use a class name, or a class plus a static field, for example
-`org.apache.calcite.materialize.Lattices#CACHING_SQL_STATISTIC_PROVIDER`.
+You can use a class name, or a class plus a static field. Example:
+
+{% highlight json %}
+ "statisticProvider": "org.apache.calcite.materialize.Lattices#CACHING_SQL_STATISTIC_PROVIDER"
+{% endhighlight %}
If not set, Calcite will generate and execute a SQL query to find the real
value, and cache the results.
-See also: <a href="{{ site.baseurl }}/lattice.md">Lattices</a>.
+See also: <a href="{{ site.baseurl }}/docs/lattice.html">Lattices</a>.
### Tile