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 2018/05/02 04:10:47 UTC
[1/2] calcite git commit: Fix sqlsh on Linux
Repository: calcite
Updated Branches:
refs/heads/master 2b93eaa35 -> 714f6b740
Fix sqlsh on Linux
Project: http://git-wip-us.apache.org/repos/asf/calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/d00733bb
Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/d00733bb
Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/d00733bb
Branch: refs/heads/master
Commit: d00733bb77ab5fe452dcbbb7b84c5d310e78533f
Parents: 2b93eaa
Author: Julian Hyde <jh...@apache.org>
Authored: Tue May 1 18:10:35 2018 -0700
Committer: Julian Hyde <jh...@apache.org>
Committed: Tue May 1 18:33:00 2018 -0700
----------------------------------------------------------------------
sqlsh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/calcite/blob/d00733bb/sqlsh
----------------------------------------------------------------------
diff --git a/sqlsh b/sqlsh
index c606f53..983e05c 100755
--- a/sqlsh
+++ b/sqlsh
@@ -22,7 +22,7 @@
# Build classpath on first call.
# (To force rebuild, remove target/fullclasspath.txt.)
-root=$(cd $(dirname $(readlink $0)); pwd)
+root=$(cd "$(dirname "$(readlink $0)")"; pwd)
if [ ! -f ${root}/target/fullclasspath.txt ]; then
(
[2/2] calcite git commit: OsAdapterTest breaks when jhyde@apache has
made more commits than julianhyde@gmail
Posted by jh...@apache.org.
OsAdapterTest breaks when jhyde@apache has made more commits than julianhyde@gmail
Project: http://git-wip-us.apache.org/repos/asf/calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/714f6b74
Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/714f6b74
Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/714f6b74
Branch: refs/heads/master
Commit: 714f6b74054de26896863fe12565f2e32bcbc863
Parents: d00733b
Author: Julian Hyde <jh...@apache.org>
Authored: Tue May 1 18:37:12 2018 -0700
Committer: Julian Hyde <jh...@apache.org>
Committed: Tue May 1 18:37:12 2018 -0700
----------------------------------------------------------------------
.../test/java/org/apache/calcite/adapter/os/OsAdapterTest.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/calcite/blob/714f6b74/plus/src/test/java/org/apache/calcite/adapter/os/OsAdapterTest.java
----------------------------------------------------------------------
diff --git a/plus/src/test/java/org/apache/calcite/adapter/os/OsAdapterTest.java b/plus/src/test/java/org/apache/calcite/adapter/os/OsAdapterTest.java
index c82d470..4793f83 100644
--- a/plus/src/test/java/org/apache/calcite/adapter/os/OsAdapterTest.java
+++ b/plus/src/test/java/org/apache/calcite/adapter/os/OsAdapterTest.java
@@ -200,8 +200,9 @@ public class OsAdapterTest {
@Test public void testGitCommitsTop() {
Assume.assumeTrue("no git", hasGit());
final String q = "select author from git_commits\n"
- + "group by 1 order by count(*) desc limit 1";
- sql(q).returnsUnordered("author=Julian Hyde <ju...@gmail.com>");
+ + "group by 1 order by count(*) desc limit 2";
+ sql(q).returnsUnordered("author=Julian Hyde <ju...@gmail.com>",
+ "author=Julian Hyde <jh...@apache.org>");
}
@Test public void testVmstat() {