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/05/06 06:32:13 UTC

[3/3] calcite git commit: Site: add committer, and post slides/video from Polyalgebra talk

Site: add committer, and post slides/video from Polyalgebra talk

Prevent jekyll from adding whitespace each time a committer is added.


Project: http://git-wip-us.apache.org/repos/asf/calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/19361b94
Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/19361b94
Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/19361b94

Branch: refs/heads/master
Commit: 19361b94a4e44601e182f2d2298bc216c017bd81
Parents: bf098dd
Author: Julian Hyde <jh...@apache.org>
Authored: Mon Apr 4 16:38:19 2016 -0700
Committer: Julian Hyde <jh...@apache.org>
Committed: Thu May 5 22:12:24 2016 -0700

----------------------------------------------------------------------
 site/_config.yml              |  2 +-
 site/_data/contributors.yml   |  6 ++++++
 site/_includes/news_item.html | 28 +++++++++++++++-------------
 site/_layouts/news_item.html  | 28 +++++++++++++++-------------
 site/community/index.md       | 14 +++++++++-----
 5 files changed, 46 insertions(+), 32 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/calcite/blob/19361b94/site/_config.yml
----------------------------------------------------------------------
diff --git a/site/_config.yml b/site/_config.yml
index 8c78d7e..1086414 100644
--- a/site/_config.yml
+++ b/site/_config.yml
@@ -20,7 +20,7 @@ excerpt_separator: ""
 repository: https://github.com/apache/calcite
 destination: target
 exclude: [README.md,Gemfile*]
-keep_files: [".git", ".svn", "apidocs", "testapidocs", "avatica"]
+keep_files: [".git", ".svn", "apidocs", "testapidocs", "avatica", "docs/cassandra.html"]
 
 collections:
   docs:

http://git-wip-us.apache.org/repos/asf/calcite/blob/19361b94/site/_data/contributors.yml
----------------------------------------------------------------------
diff --git a/site/_data/contributors.yml b/site/_data/contributors.yml
index 98f8bf9..8752770 100644
--- a/site/_data/contributors.yml
+++ b/site/_data/contributors.yml
@@ -72,6 +72,12 @@
   githubId: maryannxue
   org: Intel
   role: Committer
+- name: Michael Mior
+  apacheId: mmior
+  githubId: michaelmior
+  org: University of Waterloo
+  role: Committer
+  homepage: http://michael.mior.ca/
 - name: Nick Dimiduk
   apacheId: ndimiduk
   githubId: ndimiduk

http://git-wip-us.apache.org/repos/asf/calcite/blob/19361b94/site/_includes/news_item.html
----------------------------------------------------------------------
diff --git a/site/_includes/news_item.html b/site/_includes/news_item.html
index 34eea0b..7b48ea6 100644
--- a/site/_includes/news_item.html
+++ b/site/_includes/news_item.html
@@ -31,20 +31,22 @@ limitations under the License.
     </span>
     {% capture homepage %}http://people.apache.org/~{{ post.author }}{% endcapture %}
     {% capture avatar %}http://people.apache.org/~{{ post.author }}/{{ post.author }}.jpg{% endcapture %}
-    {% for c in site.data.contributors %}
-      {% if c.apacheId == post.author %}
-        {% if c.homepage %}
-          {% assign homepage = c.homepage %}
-        {% else %}
-          {% capture homepage %}http://github.com/{{ c.githubId }}{% endcapture %}
+    {% capture discard %}
+      {% for c in site.data.contributors %}
+        {% if c.apacheId == post.author %}
+          {% if c.homepage %}
+            {% assign homepage = c.homepage %}
+          {% else %}
+            {% capture homepage %}http://github.com/{{ c.githubId }}{% endcapture %}
+          {% endif %}
+          {% if c.avatar %}
+            {% assign avatar = c.avatar %}
+          {% else %}
+            {% capture avatar %}http://github.com/{{ c.githubId }}.png{% endcapture %}
+          {% endif %}
         {% endif %}
-        {% if c.avatar %}
-          {% assign avatar = c.avatar %}
-        {% else %}
-          {% capture avatar %}http://github.com/{{ c.githubId }}.png{% endcapture %}
-        {% endif %}
-      {% endif %}
-    {% endfor %}
+      {% endfor %}
+    {% endcapture %}{% assign discard = nil %}
     <a href="{{ homepage }}" class="post-author">
       <img src="{{ avatar }}"
            class="avatar" alt="{{ post.author }} avatar"

http://git-wip-us.apache.org/repos/asf/calcite/blob/19361b94/site/_layouts/news_item.html
----------------------------------------------------------------------
diff --git a/site/_layouts/news_item.html b/site/_layouts/news_item.html
index e91e9e5..5fd0ecc 100644
--- a/site/_layouts/news_item.html
+++ b/site/_layouts/news_item.html
@@ -18,20 +18,22 @@ layout: news
     </span>
     {% capture homepage %}http://people.apache.org/~{{ page.author }}{% endcapture %}
     {% capture avatar %}http://people.apache.org/~{{ page.author }}/{{ page.author }}.jpg{% endcapture %}
-    {% for c in site.data.contributors %}
-      {% if c.apacheId == page.author %}
-        {% if c.homepage %}
-          {% assign homepage = c.homepage %}
-        {% else %}
-          {% capture homepage %}http://github.com/{{ c.githubId }}{% endcapture %}
+    {% capture discard %}
+      {% for c in site.data.contributors %}
+        {% if c.apacheId == page.author %}
+          {% if c.homepage %}
+            {% assign homepage = c.homepage %}
+          {% else %}
+            {% capture homepage %}http://github.com/{{ c.githubId }}{% endcapture %}
+          {% endif %}
+          {% if c.avatar %}
+            {% assign avatar = c.avatar %}
+          {% else %}
+            {% capture avatar %}http://github.com/{{ c.githubId }}.png{% endcapture %}
+          {% endif %}
         {% endif %}
-        {% if c.avatar %}
-          {% assign avatar = c.avatar %}
-        {% else %}
-          {% capture avatar %}http://github.com/{{ c.githubId }}.png{% endcapture %}
-        {% endif %}
-      {% endif %}
-    {% endfor %}
+      {% endfor %}
+    {% endcapture %}{% assign discard = nil %}
     <a href="{{ homepage }}" class="post-author">
       <img src="{{ avatar }}"
            class="avatar" alt="{{ page.author }} avatar"

http://git-wip-us.apache.org/repos/asf/calcite/blob/19361b94/site/community/index.md
----------------------------------------------------------------------
diff --git a/site/community/index.md b/site/community/index.md
index 61c5cbb..7e8bec0 100644
--- a/site/community/index.md
+++ b/site/community/index.md
@@ -26,13 +26,9 @@ limitations under the License.
 
 # Upcoming talks
 
-* 2016/03/30 <a href="http://conferences.oreilly.com/strata/hadoop-big-data-ca/public/schedule/detail/48180">Strata + Hadoop World</a>, San Jose (developer showcase)
-* 2016/04/13 <a href="http://hadoopsummit.org/dublin/agenda/">Hadoop Summit</a>, Dublin
-* 2016/04/13 [Hortonworks User Group](http://www.meetup.com/Washington-DC-Hortonworks-User-Group-Meetup/events/229494421/), Baltimore
-* 2016/04/20 [Hortonworks User Group](http://www.meetup.com/Washington-DC-Hortonworks-User-Group-Meetup/events/229668371/), Herndon
-* 2016/04/26 <a href="http://kafka-summit.org/schedule/">Kafka Summit</a>, San Francisco
 * 2016/05/10 <a href="http://events.linuxfoundation.org/events/apache-big-data-north-america/program/schedule">ApacheCon Big Data North America</a>, Vancouver
 * 2016/05/24 <a href="http://www-conf.slac.stanford.edu/xldb2016/Program.asp">XLDB</a>, Palo Alto
+* 2016/06/29 <a href="http://hadoopsummit.org/san-jose/agenda/">Hadoop Summit</a>, San Jose
 
 # Project Members
 
@@ -116,6 +112,14 @@ At Samza meetup, Mountain View, CA, 2016
 
 <iframe src="//www.slideshare.net/slideshow/embed_code/key/rzaptOy3H8K6Gz" width="595" height="485" frameborder="0" marginwidth="0" marginheight="0" scrolling="no" style="border:1px solid #CCC; border-width:1px; margin-bottom:5px; max-width: 100%;" allowfullscreen> </iframe>
 
+## Planning with Polyalgebra: Bringing together relational, complex and machine learning algebra
+
+As Hadoop Summit, Dublin, 2016
+[[video](https://www.youtube.com/watch?v=fHZqbe3iPMc)],
+[[slides](http://www.slideshare.net/julianhyde/planning-with-polyalgebra-bringing-together-relational-complex-and-machine-learning-algebra)].
+
+{% oembed https://www.youtube.com/watch?v=fHZqbe3iPMc %}
+
 ## More talks
 
 * <a href="https://github.com/julianhyde/share/blob/master/slides/hive-cbo-seattle-2014.pdf?raw=true">Cost-based optimization in Hive 0.14</a> (Seattle, 2014)