You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datafu.apache.org by ey...@apache.org on 2019/05/19 07:16:03 UTC

[datafu] 01/01: Merge master back into spark-tmp

This is an automated email from the ASF dual-hosted git repository.

eyal pushed a commit to branch spark-tmp
in repository https://gitbox.apache.org/repos/asf/datafu.git

commit 519be50c7ea4d7299ec0fbd3e212424ddc7ed862
Merge: a410e1c 3e52d11
Author: Eyal Allweil <ey...@apache.org>
AuthorDate: Sun May 19 10:14:27 2019 +0300

    Merge master back into spark-tmp

 .gitignore                                         |   4 +-
 changes.md                                         |  16 ++
 .../evaluation/ExtremalTupleByNthField.java        | 306 +++++++++++++++++++++
 .../src/main/resources/datafu/count_macros.pig     |  11 +
 .../datafu/{count_macros.pig => dedup.pig}         |  24 +-
 .../src/main/resources/datafu/diff_macros.pig      |   8 +
 .../{count_macros.pig => left_outer_join.pig}      |  28 +-
 .../src/main/resources/datafu/sample_by_keys.pig   |  13 +-
 .../src/test/java/datafu/test/pig/PigTests.java    |   2 +-
 .../java/datafu/test/pig/macros/MacroTests.java    |  42 ++-
 .../test/java/datafu/test/pig/util/DedupTests.java |  91 ++++++
 gradle/release.gradle                              |   4 +-
 site/config.rb                                     |   2 -
 .../blog/2019-01-07-datafu-1-5-0-released.markdown |  45 +++
 ...ook-at-paypals-contributions-to-datafu.markdown | 242 ++++++++++++++++
 .../docs/datafu/getting-started.html.markdown.erb  |   2 +-
 site/source/docs/datafu/guide.html.markdown.erb    |   2 +-
 .../datafu/guide/bag-operations.html.markdown.erb  |   2 +-
 .../docs/datafu/guide/hashing.html.markdown.erb    |   2 +-
 .../datafu/guide/link-analysis.html.markdown.erb   |   2 +-
 .../guide/more-tips-and-tricks.html.markdown.erb   |   2 +-
 .../docs/datafu/guide/sampling.html.markdown.erb   |   2 +-
 .../docs/datafu/guide/sessions.html.markdown.erb   |   2 +-
 .../datafu/guide/set-operations.html.markdown.erb  |   2 +-
 .../docs/datafu/guide/statistics.html.markdown.erb |   2 +-
 site/source/docs/download.html.markdown.erb        |   9 +-
 site/source/layouts/_docs_nav.erb                  |   4 +-
 site/source/layouts/_footer.erb                    |   2 +-
 site/source/stylesheets/all.less                   |   8 +
 29 files changed, 830 insertions(+), 51 deletions(-)

diff --cc .gitignore
index 60d11ee,e219be2..28aa89b
--- a/.gitignore
+++ b/.gitignore
@@@ -32,12 -32,4 +32,12 @@@ datafu-pig/quer
  gradle/wrapper/gradle-wrapper.jar
  gradle/wrapper/gradle-wrapper.properties
  gradlew*
 -.java-version
++.java-version
 +datafu-spark/out
 +datafu-spark/derby.log
 +datafu-spark/spark-warehouse
 +datafu-spark/metastore_db
 +datafu-spark/bin
 +datafu-spark/test-output
 +datafu-spark/data
- datafu-spark/.apt_generated/
- 
++datafu-spark/.apt_generated/