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/07/18 19:26:58 UTC
[1/3] calcite git commit: [CALCITE-1314] Intermittent failure in
SqlParserTest.testGenerateKeyWords
Repository: calcite
Updated Branches:
refs/heads/master 840ba75e4 -> 42af029fb
[CALCITE-1314] Intermittent failure in SqlParserTest.testGenerateKeyWords
Project: http://git-wip-us.apache.org/repos/asf/calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/c22628fe
Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/c22628fe
Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/c22628fe
Branch: refs/heads/master
Commit: c22628fe0a1ae774b9f8549599bdee515cad2d2f
Parents: 840ba75
Author: Julian Hyde <jh...@apache.org>
Authored: Thu Jul 14 14:13:11 2016 -0700
Committer: Julian Hyde <jh...@apache.org>
Committed: Mon Jul 18 12:21:56 2016 -0700
----------------------------------------------------------------------
.../java/org/apache/calcite/sql/parser/SqlParserTest.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/calcite/blob/c22628fe/core/src/test/java/org/apache/calcite/sql/parser/SqlParserTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/calcite/sql/parser/SqlParserTest.java b/core/src/test/java/org/apache/calcite/sql/parser/SqlParserTest.java
index b745389..e3b572b 100644
--- a/core/src/test/java/org/apache/calcite/sql/parser/SqlParserTest.java
+++ b/core/src/test/java/org/apache/calcite/sql/parser/SqlParserTest.java
@@ -38,8 +38,8 @@ import org.junit.Test;
import java.io.BufferedReader;
import java.io.File;
+import java.io.FileOutputStream;
import java.io.FileReader;
-import java.io.FileWriter;
import java.io.IOException;
import java.io.PrintWriter;
import java.net.URL;
@@ -6468,7 +6468,8 @@ public class SqlParserTest {
final File outFile = new File(base, "core/target/surefire/reference.md");
outFile.getParentFile().mkdirs();
try (BufferedReader r = new BufferedReader(new FileReader(inFile));
- PrintWriter w = new PrintWriter(new FileWriter(outFile))) {
+ FileOutputStream fos = new FileOutputStream(outFile);
+ PrintWriter w = new PrintWriter(fos)) {
String line;
int stage = 0;
while ((line = r.readLine()) != null) {
@@ -6493,6 +6494,9 @@ public class SqlParserTest {
w.println(".");
}
}
+ w.flush();
+ fos.flush();
+ fos.getFD().sync();
}
String diff = DiffTestCase.diff(outFile, inFile);
if (!diff.isEmpty()) {
[3/3] calcite git commit: Cosmetic changes
Posted by jh...@apache.org.
Cosmetic changes
Project: http://git-wip-us.apache.org/repos/asf/calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/42af029f
Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/42af029f
Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/42af029f
Branch: refs/heads/master
Commit: 42af029fbcad199b080a37a08781508979d1ffa0
Parents: 6955a03
Author: Julian Hyde <jh...@apache.org>
Authored: Thu Jul 7 17:43:03 2016 -0700
Committer: Julian Hyde <jh...@apache.org>
Committed: Mon Jul 18 12:26:32 2016 -0700
----------------------------------------------------------------------
core/src/main/java/org/apache/calcite/plan/VisitorDataContext.java | 1 -
core/src/main/java/org/apache/calcite/rel/core/RelFactories.java | 1 -
.../java/org/apache/calcite/rel/type/DynamicRecordTypeImpl.java | 1 -
.../main/java/org/apache/calcite/rel/type/RelDataTypeHolder.java | 1 -
core/src/main/java/org/apache/calcite/sql/SqlDescribeSchema.java | 1 -
core/src/main/java/org/apache/calcite/sql/SqlDescribeTable.java | 1 -
core/src/test/java/org/apache/calcite/rex/RexBuilderTest.java | 1 +
.../org/apache/calcite/test/concurrent/ConcurrentTestPlugin.java | 1 +
.../apache/calcite/test/concurrent/ConcurrentTestPluginCommand.java | 1 +
.../test/java/org/apache/calcite/test/concurrent/SamplePlugin.java | 1 +
10 files changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/calcite/blob/42af029f/core/src/main/java/org/apache/calcite/plan/VisitorDataContext.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/plan/VisitorDataContext.java b/core/src/main/java/org/apache/calcite/plan/VisitorDataContext.java
index b7af92d..e2ab6b5 100644
--- a/core/src/main/java/org/apache/calcite/plan/VisitorDataContext.java
+++ b/core/src/main/java/org/apache/calcite/plan/VisitorDataContext.java
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.calcite.plan;
import org.apache.calcite.DataContext;
http://git-wip-us.apache.org/repos/asf/calcite/blob/42af029f/core/src/main/java/org/apache/calcite/rel/core/RelFactories.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/rel/core/RelFactories.java b/core/src/main/java/org/apache/calcite/rel/core/RelFactories.java
index 6c410b9..0d439c0 100644
--- a/core/src/main/java/org/apache/calcite/rel/core/RelFactories.java
+++ b/core/src/main/java/org/apache/calcite/rel/core/RelFactories.java
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.calcite.rel.core;
import org.apache.calcite.plan.Contexts;
http://git-wip-us.apache.org/repos/asf/calcite/blob/42af029f/core/src/main/java/org/apache/calcite/rel/type/DynamicRecordTypeImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/rel/type/DynamicRecordTypeImpl.java b/core/src/main/java/org/apache/calcite/rel/type/DynamicRecordTypeImpl.java
index 51e8c98..21206ac 100644
--- a/core/src/main/java/org/apache/calcite/rel/type/DynamicRecordTypeImpl.java
+++ b/core/src/main/java/org/apache/calcite/rel/type/DynamicRecordTypeImpl.java
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.calcite.rel.type;
import org.apache.calcite.sql.type.SqlTypeExplicitPrecedenceList;
http://git-wip-us.apache.org/repos/asf/calcite/blob/42af029f/core/src/main/java/org/apache/calcite/rel/type/RelDataTypeHolder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/rel/type/RelDataTypeHolder.java b/core/src/main/java/org/apache/calcite/rel/type/RelDataTypeHolder.java
index 6db8519..414045d 100644
--- a/core/src/main/java/org/apache/calcite/rel/type/RelDataTypeHolder.java
+++ b/core/src/main/java/org/apache/calcite/rel/type/RelDataTypeHolder.java
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.calcite.rel.type;
import org.apache.calcite.sql.type.SqlTypeName;
http://git-wip-us.apache.org/repos/asf/calcite/blob/42af029f/core/src/main/java/org/apache/calcite/sql/SqlDescribeSchema.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/SqlDescribeSchema.java b/core/src/main/java/org/apache/calcite/sql/SqlDescribeSchema.java
index 57c408c..47a499e 100644
--- a/core/src/main/java/org/apache/calcite/sql/SqlDescribeSchema.java
+++ b/core/src/main/java/org/apache/calcite/sql/SqlDescribeSchema.java
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.calcite.sql;
import org.apache.calcite.sql.parser.SqlParserPos;
http://git-wip-us.apache.org/repos/asf/calcite/blob/42af029f/core/src/main/java/org/apache/calcite/sql/SqlDescribeTable.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/SqlDescribeTable.java b/core/src/main/java/org/apache/calcite/sql/SqlDescribeTable.java
index ef0caff..7360b8a 100644
--- a/core/src/main/java/org/apache/calcite/sql/SqlDescribeTable.java
+++ b/core/src/main/java/org/apache/calcite/sql/SqlDescribeTable.java
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.calcite.sql;
import org.apache.calcite.sql.parser.SqlParserPos;
http://git-wip-us.apache.org/repos/asf/calcite/blob/42af029f/core/src/test/java/org/apache/calcite/rex/RexBuilderTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/calcite/rex/RexBuilderTest.java b/core/src/test/java/org/apache/calcite/rex/RexBuilderTest.java
index 28671fc..bbf95f0 100644
--- a/core/src/test/java/org/apache/calcite/rex/RexBuilderTest.java
+++ b/core/src/test/java/org/apache/calcite/rex/RexBuilderTest.java
@@ -81,4 +81,5 @@ public class RexBuilderTest {
}
}
+
// End RexBuilderTest.java
http://git-wip-us.apache.org/repos/asf/calcite/blob/42af029f/core/src/test/java/org/apache/calcite/test/concurrent/ConcurrentTestPlugin.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/calcite/test/concurrent/ConcurrentTestPlugin.java b/core/src/test/java/org/apache/calcite/test/concurrent/ConcurrentTestPlugin.java
index 290d795..0e178bb 100644
--- a/core/src/test/java/org/apache/calcite/test/concurrent/ConcurrentTestPlugin.java
+++ b/core/src/test/java/org/apache/calcite/test/concurrent/ConcurrentTestPlugin.java
@@ -71,4 +71,5 @@ public abstract class ConcurrentTestPlugin {
public void preSetupFor(String name, String params) {
}
}
+
// End ConcurrentTestPlugin.java
http://git-wip-us.apache.org/repos/asf/calcite/blob/42af029f/core/src/test/java/org/apache/calcite/test/concurrent/ConcurrentTestPluginCommand.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/calcite/test/concurrent/ConcurrentTestPluginCommand.java b/core/src/test/java/org/apache/calcite/test/concurrent/ConcurrentTestPluginCommand.java
index d5a2335..37fb55b 100644
--- a/core/src/test/java/org/apache/calcite/test/concurrent/ConcurrentTestPluginCommand.java
+++ b/core/src/test/java/org/apache/calcite/test/concurrent/ConcurrentTestPluginCommand.java
@@ -57,4 +57,5 @@ public interface ConcurrentTestPluginCommand {
*/
void execute(TestContext testContext) throws IOException;
}
+
// End ConcurrentTestPluginCommand.java
http://git-wip-us.apache.org/repos/asf/calcite/blob/42af029f/core/src/test/java/org/apache/calcite/test/concurrent/SamplePlugin.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/calcite/test/concurrent/SamplePlugin.java b/core/src/test/java/org/apache/calcite/test/concurrent/SamplePlugin.java
index 3630e48..e6211a1 100644
--- a/core/src/test/java/org/apache/calcite/test/concurrent/SamplePlugin.java
+++ b/core/src/test/java/org/apache/calcite/test/concurrent/SamplePlugin.java
@@ -68,4 +68,5 @@ public class SamplePlugin extends ConcurrentTestPlugin {
}
}
}
+
// End SamplePlugin.java
[2/3] calcite git commit: Document release process
Posted by jh...@apache.org.
Document release process
Change highlighting to work around https://github.com/jekyll/jekyll/issues/4448
Project: http://git-wip-us.apache.org/repos/asf/calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/6955a03b
Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/6955a03b
Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/6955a03b
Branch: refs/heads/master
Commit: 6955a03b82f1237b09c3c69485783ba68254698a
Parents: c22628f
Author: Julian Hyde <jh...@apache.org>
Authored: Wed Jul 6 11:26:37 2016 -0700
Committer: Julian Hyde <jh...@apache.org>
Committed: Mon Jul 18 12:21:57 2016 -0700
----------------------------------------------------------------------
site/_docs/adapter.md | 5 ++---
site/_docs/howto.md | 14 ++++++++------
2 files changed, 10 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/calcite/blob/6955a03b/site/_docs/adapter.md
----------------------------------------------------------------------
diff --git a/site/_docs/adapter.md b/site/_docs/adapter.md
index 987538f..d7f4427 100644
--- a/site/_docs/adapter.md
+++ b/site/_docs/adapter.md
@@ -100,7 +100,7 @@ For example,
makes a connection to the Cassandra adapter, equivalent to writing the following model file:
-```json
+{% highlight json %}
{
"version": "1.0",
"defaultSchema": "foodmart",
@@ -116,7 +116,6 @@ makes a connection to the Cassandra adapter, equivalent to writing the following
}
]
}
-
-```
+{% endhighlight %}
Note how each key in the `operand` section appears with a `schema.` prefix in the connect string.
http://git-wip-us.apache.org/repos/asf/calcite/blob/6955a03b/site/_docs/howto.md
----------------------------------------------------------------------
diff --git a/site/_docs/howto.md b/site/_docs/howto.md
index b31d985..6fa2a8f 100644
--- a/site/_docs/howto.md
+++ b/site/_docs/howto.md
@@ -486,8 +486,8 @@ read -s GPG_PASSPHRASE
git clean -xn
mvn clean
-# Do a dry run of the release:prepare step, which sets version numbers.
-mvn -DdryRun=true -DskipTests -DreleaseVersion=X.Y.Z -DdevelopmentVersion=X.Y.Z+1-SNAPSHOT -Papache-release -Darguments="-Dgpg.passphrase=${GPG_PASSPHRASE}" release:prepare 2>&1 | tee /tmp/prepare-dry.log
+# Do a dry run of the release:prepare step, which sets version numbers
+mvn -DdryRun=true -DskipTests -DreleaseVersion=X.Y.Z -DdevelopmentVersion=X.Y+1.Z-SNAPSHOT -Papache-release -Darguments="-Dgpg.passphrase=${GPG_PASSPHRASE}" release:prepare 2>&1 | tee /tmp/prepare-dry.log
{% endhighlight %}
Check the artifacts:
@@ -508,20 +508,22 @@ Check the artifacts:
* That directory must contain files `NOTICE`, `LICENSE`,
`README`, `README.md`
* Check that the version in `README` is correct
+ * Check that the copyright year in `NOTICE` is correct
* In each .jar (for example
`core/target/calcite-core-X.Y.Z.jar` and
`mongodb/target/calcite-mongodb-X.Y.Z-sources.jar`), check
that the `META-INF` directory contains `DEPENDENCIES`, `LICENSE`,
`NOTICE` and `git.properties`
-* In each .jar, check that `org-apache-calcite-jdbc.properties` is
+* In `core/target/calcite-core-X.Y.Z.jar`,
+ check that `org-apache-calcite-jdbc.properties` is
present and does not contain un-substituted `${...}` variables
* Check PGP, per [this](https://httpd.apache.org/dev/verification.html)
Now, remove the `-DdryRun` flag and run the release for real.
{% highlight bash %}
-# Prepare sets the version numbers, creates a tag, and pushes it to git.
-mvn -DdryRun=false -DskipTests -DreleaseVersion=X.Y.Z -DdevelopmentVersion=X.Y.Z+1-SNAPSHOT -Papache-release -Darguments="-Dgpg.passphrase=${GPG_PASSPHRASE}" release:prepare 2>&1 | tee /tmp/prepare.log
+# Prepare sets the version numbers, creates a tag, and pushes it to git
+mvn -DdryRun=false -DskipTests -DreleaseVersion=X.Y.Z -DdevelopmentVersion=X.Y+1.Z-SNAPSHOT -Papache-release -Darguments="-Dgpg.passphrase=${GPG_PASSPHRASE}" release:prepare 2>&1 | tee /tmp/prepare.log
# Perform checks out the tagged version, builds, and deploys to the staging repository
mvn -DskipTests -Papache-release -Darguments="-Dgpg.passphrase=${GPG_PASSPHRASE}" release:perform 2>&1 | tee /tmp/perform.log
@@ -582,7 +584,7 @@ git reset --hard HEAD
## Validate a release
{% highlight bash %}
-# Check that the signing key (e.g. 2AD3FAE3) is pushed
+# Check that the signing key (e.g. DDB6E9812AD3FAE3) is pushed
gpg --recv-keys key
# Check keys