You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datafu.apache.org by mh...@apache.org on 2018/01/29 20:27:30 UTC
[1/8] incubator-datafu git commit: Update changes.md for 1.3.3 release
Repository: incubator-datafu
Updated Branches:
refs/heads/master fa5c15a20 -> 9bbf2a2bb
Update changes.md for 1.3.3 release
Project: http://git-wip-us.apache.org/repos/asf/incubator-datafu/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-datafu/commit/1d50a8e0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-datafu/tree/1d50a8e0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-datafu/diff/1d50a8e0
Branch: refs/heads/master
Commit: 1d50a8e0ce5a0d6be5c525ed0b004fb0aeb07de9
Parents: ca459d7
Author: Matthew Hayes <mh...@apache.org>
Authored: Thu Jan 11 18:39:51 2018 -0800
Committer: Matthew Hayes <mh...@apache.org>
Committed: Thu Jan 11 18:39:51 2018 -0800
----------------------------------------------------------------------
changes.md | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-datafu/blob/1d50a8e0/changes.md
----------------------------------------------------------------------
diff --git a/changes.md b/changes.md
index 7bd6f7d..b175a92 100644
--- a/changes.md
+++ b/changes.md
@@ -1,3 +1,20 @@
+# 1.3.3
+
+Additions:
+
+* UDF for hash functions such as murmur3 and others. (DATAFU-47)
+* UDF for diffing tuples. (DATAFU-119)
+* Support for macros in DataFu. Macros count_all_non_distinct and count_distinct_keys were added. (DATAFU-123)
+* Macro for TFIDF. (DATAFU-61)
+
+Improvements:
+
+* Added lifecylce hooks to ContextualEvalFunc. (DATAFU-50)
+* SessionCount and Sessionize now support millisecond precision. (DATAFU-124)
+* Upgraded to Guava 20.0. (DATAFU-48)
+* Updated Gradle to 3.5.1. (DATAFU-125)
+* Rat tasks automatically run during assemble. (DATAFU-118)
+
# 1.3.2
Improvements:
[7/8] incubator-datafu git commit: DATAFU-135 Remove website from
source release
Posted by mh...@apache.org.
DATAFU-135 Remove website from source release
Project: http://git-wip-us.apache.org/repos/asf/incubator-datafu/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-datafu/commit/a73f884c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-datafu/tree/a73f884c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-datafu/diff/a73f884c
Branch: refs/heads/master
Commit: a73f884c10deefb4ba546ed84c3a138faaef81ac
Parents: df4b39f
Author: Matthew Hayes <mh...@apache.org>
Authored: Thu Jan 18 15:57:40 2018 -0800
Committer: Matthew Hayes <mh...@apache.org>
Committed: Thu Jan 18 15:57:40 2018 -0800
----------------------------------------------------------------------
LICENSE | 40 +---------------------------------------
gradle/release.gradle | 1 +
2 files changed, 2 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-datafu/blob/a73f884c/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index da23a8e..00ec0f1 100644
--- a/LICENSE
+++ b/LICENSE
@@ -210,47 +210,9 @@ subcomponents is subject to the terms and conditions of the following
licenses.
-----------------------------------------------------------------------
- The Apache License, Version 2.0
------------------------------------------------------------------------
-
-The Apache DataFu project bundles the following files under the Apache License, Version 2.0:
-
-- Bootstrap v3.0.3 (http://getbootstrap.com) - Copyright 2013 Twitter, Inc.
-- Glyphicons fonts v3.1.1 (http://glyphicons.com/) - Copyright (c) 2010-2014 Jan Kovařík
-
------------------------------------------------------------------------
- The MIT License
------------------------------------------------------------------------
-
-The Apache DataFu project bundles the following files under the MIT License:
-
-- normalize.css v2.0.1 (http://git.io/normalize) - Copyright (c) Nicolas Gallagher and Jonathan Neal
-- jquery-2.0.3.min.js v2.0.3 (http://jquery.com/) - Copyright (c) 2005, 2013 jQuery Foundation, Inc.
-
-All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
------------------------------------------------------------------------
Public Domain
-----------------------------------------------------------------------
The Apache DataFu project bundles the following released to the Public Domain:
-- Java Multiline String (http://www.adrianwalker.org/2011/12/java-multiline-string.html)
\ No newline at end of file
+- Java Multiline String (http://www.adrianwalker.org/2011/12/java-multiline-string.html)
http://git-wip-us.apache.org/repos/asf/incubator-datafu/blob/a73f884c/gradle/release.gradle
----------------------------------------------------------------------
diff --git a/gradle/release.gradle b/gradle/release.gradle
index 89db97d..6cb51f1 100644
--- a/gradle/release.gradle
+++ b/gradle/release.gradle
@@ -75,6 +75,7 @@ task sourceRelease(type: Tar, dependsOn: prepare_release_config) {
exclude 'gradlew.bat'
exclude 'gradle/wrapper/gradle-wrapper.jar'
exclude 'gradle/wrapper/gradle-wrapper.properties'
+ exclude 'site'
}
// rename gradle.properties.release to gradle.properties
[3/8] incubator-datafu git commit: DATAFU-99 Fix build on Windows
Posted by mh...@apache.org.
DATAFU-99 Fix build on Windows
Signed-off-by: Matthew Hayes <mh...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-datafu/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-datafu/commit/42378d03
Tree: http://git-wip-us.apache.org/repos/asf/incubator-datafu/tree/42378d03
Diff: http://git-wip-us.apache.org/repos/asf/incubator-datafu/diff/42378d03
Branch: refs/heads/master
Commit: 42378d031f886c97e12093041cc213efcf1e7fc5
Parents: 3e79e10
Author: Eyal Allweil <ea...@paypal.com>
Authored: Mon Jan 8 17:05:54 2018 +0200
Committer: Matthew Hayes <mh...@apache.org>
Committed: Thu Jan 18 15:24:14 2018 -0800
----------------------------------------------------------------------
gradle/release.gradle | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-datafu/blob/42378d03/gradle/release.gradle
----------------------------------------------------------------------
diff --git a/gradle/release.gradle b/gradle/release.gradle
index 32d8054..3573c82 100644
--- a/gradle/release.gradle
+++ b/gradle/release.gradle
@@ -34,7 +34,12 @@ if (!isRelease) {
// built.
task prepare_release_config(type: Copy) {
from "$rootDir/gradle.properties"
- into "$rootDir"
+
+ // there is a bug in Gradle on Windows that prevents copy tasks from copying into the same folder.
+ // Therefore, we copy to a temporary dir, and use the copy method (which doesn't have this bug)
+ // to copy back into rootDir so the Windows build works, even though this is ugly.
+ // https://discuss.gradle.org/t/error-with-a-copy-task-on-windows/1803
+ into temporaryDir
rename { filename ->
filename + ".release" }
filter { line ->
@@ -45,6 +50,13 @@ task prepare_release_config(type: Copy) {
line
}
}
+ doLast {
+ copy {
+ from temporaryDir
+ into "$rootDir"
+ include 'gradle.properties.release'
+ }
+ }
}
task sourceRelease(type: Tar, dependsOn: prepare_release_config) {
[6/8] incubator-datafu git commit: Update changes.md for more 1.3.3
changes
Posted by mh...@apache.org.
Update changes.md for more 1.3.3 changes
Project: http://git-wip-us.apache.org/repos/asf/incubator-datafu/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-datafu/commit/df4b39fc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-datafu/tree/df4b39fc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-datafu/diff/df4b39fc
Branch: refs/heads/master
Commit: df4b39fcdeb3b896361ad4831b139f22ef2a8cda
Parents: 7d4fb64
Author: Matthew Hayes <mh...@apache.org>
Authored: Thu Jan 18 15:44:41 2018 -0800
Committer: Matthew Hayes <mh...@apache.org>
Committed: Thu Jan 18 15:44:41 2018 -0800
----------------------------------------------------------------------
changes.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-datafu/blob/df4b39fc/changes.md
----------------------------------------------------------------------
diff --git a/changes.md b/changes.md
index b175a92..5bbcfea 100644
--- a/changes.md
+++ b/changes.md
@@ -14,6 +14,7 @@ Improvements:
* Upgraded to Guava 20.0. (DATAFU-48)
* Updated Gradle to 3.5.1. (DATAFU-125)
* Rat tasks automatically run during assemble. (DATAFU-118)
+* Building now works on Windows. (DATAFU-99)
# 1.3.2
[2/8] incubator-datafu git commit: DATAFU-134 Add bootstrap to
LICENSE file
Posted by mh...@apache.org.
DATAFU-134 Add bootstrap to LICENSE file
I've listed bootstrap and glyphicons in the LICENSE file as Apache 2.0-licensed. Bootstrap 3.0.3 is Apache 2.0 licensed. Glyphicons is released as an extension of bootstrap and is released under the same license as bootstrap.
I've also removed the normalize.css file, which isn't used.
Project: http://git-wip-us.apache.org/repos/asf/incubator-datafu/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-datafu/commit/3e79e10c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-datafu/tree/3e79e10c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-datafu/diff/3e79e10c
Branch: refs/heads/master
Commit: 3e79e10cb38fa187f7434bd26dafe14842438901
Parents: 1d50a8e
Author: Matthew Hayes <ma...@gmail.com>
Authored: Thu Jan 18 12:30:39 2018 -0800
Committer: Matthew Hayes <ma...@gmail.com>
Committed: Thu Jan 18 12:30:39 2018 -0800
----------------------------------------------------------------------
LICENSE | 10 +-
site/source/stylesheets/normalize.css | 375 -----------------------------
2 files changed, 9 insertions(+), 376 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-datafu/blob/3e79e10c/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 4c20eac..38e6fe1 100644
--- a/LICENSE
+++ b/LICENSE
@@ -210,6 +210,15 @@ subcomponents is subject to the terms and conditions of the following
licenses.
-----------------------------------------------------------------------
+ The Apache License, Version 2.0
+-----------------------------------------------------------------------
+
+The Apache DataFu project bundles the following files under the Apache License, Version 2.0:
+
+- Bootstrap v3.0.3 (http://getbootstrap.com) - Copyright 2013 Twitter, Inc.
+- Glyphicons fonts v3.1.1 (http://glyphicons.com/) - Copyright (c) 2010-2014 Jan Kovařík
+
+-----------------------------------------------------------------------
The MIT License
-----------------------------------------------------------------------
@@ -217,7 +226,6 @@ The Apache DataFu project bundles the following files under the MIT License:
- normalize.css v2.0.1 (http://git.io/normalize) - Copyright (c) Nicolas Gallagher and Jonathan Neal
- jquery-2.0.3.min.js v2.0.3 (http://jquery.com/) - Copyright (c) 2005, 2013 jQuery Foundation, Inc.
-- Glyphicons fonts v3.1.1 (http://glyphicons.com/) - Copyright (c) 2010-2014 Jan Kovařík
All rights reserved.
http://git-wip-us.apache.org/repos/asf/incubator-datafu/blob/3e79e10c/site/source/stylesheets/normalize.css
----------------------------------------------------------------------
diff --git a/site/source/stylesheets/normalize.css b/site/source/stylesheets/normalize.css
deleted file mode 100644
index 73abb76..0000000
--- a/site/source/stylesheets/normalize.css
+++ /dev/null
@@ -1,375 +0,0 @@
-/*! normalize.css v2.0.1 | MIT License | git.io/normalize */
-
-/* ==========================================================================
- HTML5 display definitions
- ========================================================================== */
-
-/*
- * Corrects `block` display not defined in IE 8/9.
- */
-
-article,
-aside,
-details,
-figcaption,
-figure,
-footer,
-header,
-hgroup,
-nav,
-section,
-summary {
- display: block;
-}
-
-/*
- * Corrects `inline-block` display not defined in IE 8/9.
- */
-
-audio,
-canvas,
-video {
- display: inline-block;
-}
-
-/*
- * Prevents modern browsers from displaying `audio` without controls.
- * Remove excess height in iOS 5 devices.
- */
-
-audio:not([controls]) {
- display: none;
- height: 0;
-}
-
-/*
- * Addresses styling for `hidden` attribute not present in IE 8/9.
- */
-
-[hidden] {
- display: none;
-}
-
-/* ==========================================================================
- Base
- ========================================================================== */
-
-/*
- * 1. Sets default font family to sans-serif.
- * 2. Prevents iOS text size adjust after orientation change, without disabling
- * user zoom.
- */
-
-html {
- font-family: sans-serif; /* 1 */
- -webkit-text-size-adjust: 100%; /* 2 */
- -ms-text-size-adjust: 100%; /* 2 */
-}
-
-/*
- * Removes default margin.
- */
-
-body {
- margin: 0;
-}
-
-/* ==========================================================================
- Links
- ========================================================================== */
-
-/*
- * Addresses `outline` inconsistency between Chrome and other browsers.
- */
-
-a:focus {
- outline: thin dotted;
-}
-
-/*
- * Improves readability when focused and also mouse hovered in all browsers.
- */
-
-a:active,
-a:hover {
- outline: 0;
-}
-
-/* ==========================================================================
- Typography
- ========================================================================== */
-
-/*
- * Addresses `h1` font sizes within `section` and `article` in Firefox 4+,
- * Safari 5, and Chrome.
- */
-
-h1 {
- font-size: 2em;
-}
-
-/*
- * Addresses styling not present in IE 8/9, Safari 5, and Chrome.
- */
-
-abbr[title] {
- border-bottom: 1px dotted;
-}
-
-/*
- * Addresses style set to `bolder` in Firefox 4+, Safari 5, and Chrome.
- */
-
-b,
-strong {
- font-weight: bold;
-}
-
-/*
- * Addresses styling not present in Safari 5 and Chrome.
- */
-
-dfn {
- font-style: italic;
-}
-
-/*
- * Addresses styling not present in IE 8/9.
- */
-
-mark {
- background: #ff0;
- color: #000;
-}
-
-
-/*
- * Corrects font family set oddly in Safari 5 and Chrome.
- */
-
-code,
-kbd,
-pre,
-samp {
- font-family: monospace, serif;
- font-size: 1em;
-}
-
-/*
- * Improves readability of pre-formatted text in all browsers.
- */
-
-pre {
- white-space: pre;
- white-space: pre-wrap;
- word-wrap: break-word;
-}
-
-/*
- * Sets consistent quote types.
- */
-
-q {
- quotes: "\201C" "\201D" "\2018" "\2019";
-}
-
-/*
- * Addresses inconsistent and variable font size in all browsers.
- */
-
-small {
- font-size: 80%;
-}
-
-/*
- * Prevents `sub` and `sup` affecting `line-height` in all browsers.
- */
-
-sub,
-sup {
- font-size: 75%;
- line-height: 0;
- position: relative;
- vertical-align: baseline;
-}
-
-sup {
- top: -0.5em;
-}
-
-sub {
- bottom: -0.25em;
-}
-
-/* ==========================================================================
- Embedded content
- ========================================================================== */
-
-/*
- * Removes border when inside `a` element in IE 8/9.
- */
-
-img {
- border: 0;
-}
-
-/*
- * Corrects overflow displayed oddly in IE 9.
- */
-
-svg:not(:root) {
- overflow: hidden;
-}
-
-/* ==========================================================================
- Figures
- ========================================================================== */
-
-/*
- * Addresses margin not present in IE 8/9 and Safari 5.
- */
-
-figure {
- margin: 0;
-}
-
-/* ==========================================================================
- Forms
- ========================================================================== */
-
-/*
- * Define consistent border, margin, and padding.
- */
-
-fieldset {
- border: 1px solid #c0c0c0;
- margin: 0 2px;
- padding: 0.35em 0.625em 0.75em;
-}
-
-/*
- * 1. Corrects color not being inherited in IE 8/9.
- * 2. Remove padding so people aren't caught out if they zero out fieldsets.
- */
-
-legend {
- border: 0; /* 1 */
- padding: 0; /* 2 */
-}
-
-/*
- * 1. Corrects font family not being inherited in all browsers.
- * 2. Corrects font size not being inherited in all browsers.
- * 3. Addresses margins set differently in Firefox 4+, Safari 5, and Chrome
- */
-
-button,
-input,
-select,
-textarea {
- font-family: inherit; /* 1 */
- font-size: 100%; /* 2 */
- margin: 0; /* 3 */
-}
-
-/*
- * Addresses Firefox 4+ setting `line-height` on `input` using `!important` in
- * the UA stylesheet.
- */
-
-button,
-input {
- line-height: normal;
-}
-
-/*
- * 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio`
- * and `video` controls.
- * 2. Corrects inability to style clickable `input` types in iOS.
- * 3. Improves usability and consistency of cursor style between image-type
- * `input` and others.
- */
-
-button,
-html input[type="button"], /* 1 */
-input[type="reset"],
-input[type="submit"] {
- -webkit-appearance: button; /* 2 */
- cursor: pointer; /* 3 */
-}
-
-/*
- * Re-set default cursor for disabled elements.
- */
-
-button[disabled],
-input[disabled] {
- cursor: default;
-}
-
-/*
- * 1. Addresses box sizing set to `content-box` in IE 8/9.
- * 2. Removes excess padding in IE 8/9.
- */
-
-input[type="checkbox"],
-input[type="radio"] {
- box-sizing: border-box; /* 1 */
- padding: 0; /* 2 */
-}
-
-/*
- * 1. Addresses `appearance` set to `searchfield` in Safari 5 and Chrome.
- * 2. Addresses `box-sizing` set to `border-box` in Safari 5 and Chrome
- * (include `-moz` to future-proof).
- */
-
-input[type="search"] {
- -webkit-appearance: textfield; /* 1 */
- -moz-box-sizing: content-box;
- -webkit-box-sizing: content-box; /* 2 */
- box-sizing: content-box;
-}
-
-/*
- * Removes inner padding and search cancel button in Safari 5 and Chrome
- * on OS X.
- */
-
-input[type="search"]::-webkit-search-cancel-button,
-input[type="search"]::-webkit-search-decoration {
- -webkit-appearance: none;
-}
-
-/*
- * Removes inner padding and border in Firefox 4+.
- */
-
-button::-moz-focus-inner,
-input::-moz-focus-inner {
- border: 0;
- padding: 0;
-}
-
-/*
- * 1. Removes default vertical scrollbar in IE 8/9.
- * 2. Improves readability and alignment in all browsers.
- */
-
-textarea {
- overflow: auto; /* 1 */
- vertical-align: top; /* 2 */
-}
-
-/* ==========================================================================
- Tables
- ========================================================================== */
-
-/*
- * Remove most spacing between table cells.
- */
-
-table {
- border-collapse: collapse;
- border-spacing: 0;
-}
\ No newline at end of file
[5/8] incubator-datafu git commit: DATAFU-133 Remove json dependency.
Posted by mh...@apache.org.
DATAFU-133 Remove json dependency.
This removes the dependency on the json library and replaces it with a dependency on the json-simple library, which is Apache 2.0.
I've also updated the year in the NOTICE file and other places.
Project: http://git-wip-us.apache.org/repos/asf/incubator-datafu/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-datafu/commit/7d4fb64b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-datafu/tree/7d4fb64b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-datafu/diff/7d4fb64b
Branch: refs/heads/master
Commit: 7d4fb64b1b1379020b340d2e045315ed5a8bac23
Parents: b52b1fe
Author: Matthew Hayes <mh...@apache.org>
Authored: Thu Jan 18 15:32:46 2018 -0800
Committer: Matthew Hayes <mh...@apache.org>
Committed: Thu Jan 18 15:32:46 2018 -0800
----------------------------------------------------------------------
LICENSE | 16 ---------
NOTICE | 2 +-
datafu-hourglass/build.gradle | 6 ++--
.../hourglass/avro/AvroMultipleInputsUtil.java | 34 +++++++++-----------
.../src/main/resources/META-INF/NOTICE | 2 +-
datafu-pig/src/main/resources/META-INF/NOTICE | 2 +-
gradle/dependency-versions.gradle | 2 +-
site/source/layouts/_footer.erb | 2 +-
8 files changed, 23 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-datafu/blob/7d4fb64b/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 38e6fe1..da23a8e 100644
--- a/LICENSE
+++ b/LICENSE
@@ -248,22 +248,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
-----------------------------------------------------------------------
- The JSON License
------------------------------------------------------------------------
-
-The Apache DataFu project bundles the following under the JSON License:
-
-- json v20090211 (http://json.org/) - Copyright (c) 2002 JSON.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
------------------------------------------------------------------------
Public Domain
-----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-datafu/blob/7d4fb64b/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index ac686e7..0f490af 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
Apache DataFu
-Copyright 2010-2017 The Apache Software Foundation
+Copyright 2010-2018 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/incubator-datafu/blob/7d4fb64b/datafu-hourglass/build.gradle
----------------------------------------------------------------------
diff --git a/datafu-hourglass/build.gradle b/datafu-hourglass/build.gradle
index 027d8f4..d3819ce 100644
--- a/datafu-hourglass/build.gradle
+++ b/datafu-hourglass/build.gradle
@@ -102,7 +102,7 @@ task copyDemoDependencies(type: Copy, dependsOn: replace_demo_dependencies_dir)
dependencies {
// core dependencies, listed as dependencies in pom
core "log4j:log4j:$log4jVersion"
- core "org.json:json:$jsonVersion"
+ core "com.googlecode.json-simple:json-simple:$jsonVersion"
core "org.apache.avro:avro:$avroVersion"
core "org.apache.avro:avro-compiler:$avroVersion"
core "org.apache.commons:commons-math:$commonsMathVersion"
@@ -159,8 +159,8 @@ modifyPom {
version "$log4jVersion"
}
dependency {
- groupId 'org.json'
- artifactId 'json'
+ groupId 'com.googlecode.json-simple'
+ artifactId 'json-simple'
version "$jsonVersion"
}
dependency {
http://git-wip-us.apache.org/repos/asf/incubator-datafu/blob/7d4fb64b/datafu-hourglass/src/main/java/datafu/hourglass/avro/AvroMultipleInputsUtil.java
----------------------------------------------------------------------
diff --git a/datafu-hourglass/src/main/java/datafu/hourglass/avro/AvroMultipleInputsUtil.java b/datafu-hourglass/src/main/java/datafu/hourglass/avro/AvroMultipleInputsUtil.java
index bf6071e..32a1e95 100644
--- a/datafu-hourglass/src/main/java/datafu/hourglass/avro/AvroMultipleInputsUtil.java
+++ b/datafu-hourglass/src/main/java/datafu/hourglass/avro/AvroMultipleInputsUtil.java
@@ -25,8 +25,9 @@ import org.apache.hadoop.mapreduce.InputSplit;
import org.apache.hadoop.mapreduce.Job;
import org.apache.hadoop.mapreduce.lib.input.FileSplit;
import org.apache.log4j.Logger;
-import org.json.JSONException;
-import org.json.JSONObject;
+import org.json.simple.JSONObject;
+import org.json.simple.parser.JSONParser;
+import org.json.simple.parser.ParseException;
/**
* Helper methods for dealing with multiple Avro input schemas. A mapping is stored in the configuration
@@ -48,7 +49,7 @@ public class AvroMultipleInputsUtil
* @return schema
*/
public static Schema getInputKeySchemaForSplit(Configuration conf, InputSplit split)
- {
+ {
String path = ((FileSplit)split).getPath().toString();
_log.info("Determining schema for input path " + path);
JSONObject schemas;
@@ -56,28 +57,22 @@ public class AvroMultipleInputsUtil
{
schemas = getInputSchemas(conf);
}
- catch (JSONException e1)
+ catch (ParseException e1)
{
throw new RuntimeException(e1);
}
Schema schema = null;
if (schemas != null)
{
- for (String key : JSONObject.getNames(schemas))
+ for (Object keyObj : schemas.keySet())
{
+ String key = (String)keyObj;
_log.info("Checking against " + key);
if (path.startsWith(key))
{
- try
- {
- schema = new Schema.Parser().parse(schemas.getString(key));
- _log.info("Input schema found: " + schema.toString(true));
- break;
- }
- catch (JSONException e)
- {
- throw new RuntimeException(e);
- }
+ schema = new Schema.Parser().parse((String)schemas.get(key));
+ _log.info("Input schema found: " + schema.toString(true));
+ break;
}
}
}
@@ -95,6 +90,7 @@ public class AvroMultipleInputsUtil
* @param schema The input key schema.
* @param path the path to set the schema for
*/
+ @SuppressWarnings("unchecked")
public static void setInputKeySchemaForPath(Job job, Schema schema, String path)
{
JSONObject schemas;
@@ -103,7 +99,7 @@ public class AvroMultipleInputsUtil
schemas = getInputSchemas(job.getConfiguration());
schemas.put(path, schema.toString());
}
- catch (JSONException e)
+ catch (ParseException e)
{
throw new RuntimeException(e);
}
@@ -115,9 +111,9 @@ public class AvroMultipleInputsUtil
*
* @param conf
* @return mapping from path to input schem
- * @throws JSONException
+ * @throws ParseException
*/
- private static JSONObject getInputSchemas(Configuration conf) throws JSONException
+ private static JSONObject getInputSchemas(Configuration conf) throws ParseException
{
JSONObject schemas;
@@ -129,7 +125,7 @@ public class AvroMultipleInputsUtil
}
else
{
- schemas = new JSONObject(schemasJson);
+ schemas = (JSONObject)new JSONParser().parse(schemasJson);
}
return schemas;
http://git-wip-us.apache.org/repos/asf/incubator-datafu/blob/7d4fb64b/datafu-hourglass/src/main/resources/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/datafu-hourglass/src/main/resources/META-INF/NOTICE b/datafu-hourglass/src/main/resources/META-INF/NOTICE
index ac686e7..0f490af 100644
--- a/datafu-hourglass/src/main/resources/META-INF/NOTICE
+++ b/datafu-hourglass/src/main/resources/META-INF/NOTICE
@@ -1,5 +1,5 @@
Apache DataFu
-Copyright 2010-2017 The Apache Software Foundation
+Copyright 2010-2018 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/incubator-datafu/blob/7d4fb64b/datafu-pig/src/main/resources/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/datafu-pig/src/main/resources/META-INF/NOTICE b/datafu-pig/src/main/resources/META-INF/NOTICE
index 18fba06..f2deef2 100644
--- a/datafu-pig/src/main/resources/META-INF/NOTICE
+++ b/datafu-pig/src/main/resources/META-INF/NOTICE
@@ -1,5 +1,5 @@
Apache DataFu
-Copyright 2010-2017 The Apache Software Foundation
+Copyright 2010-2018 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/incubator-datafu/blob/7d4fb64b/gradle/dependency-versions.gradle
----------------------------------------------------------------------
diff --git a/gradle/dependency-versions.gradle b/gradle/dependency-versions.gradle
index 9053bf2..5500df2 100644
--- a/gradle/dependency-versions.gradle
+++ b/gradle/dependency-versions.gradle
@@ -36,7 +36,7 @@ ext {
wagonHttpVersion="1.0-beta-2"
openNlpVersion="1.5.3"
openNlpMaxEntVersion="3.0.3"
- jsonVersion="20090211"
+ jsonVersion="1.1.1"
jsr311Version="1.1.1"
slf4jVersion="1.6.4"
}
http://git-wip-us.apache.org/repos/asf/incubator-datafu/blob/7d4fb64b/site/source/layouts/_footer.erb
----------------------------------------------------------------------
diff --git a/site/source/layouts/_footer.erb b/site/source/layouts/_footer.erb
index fcf0235..36710c3 100644
--- a/site/source/layouts/_footer.erb
+++ b/site/source/layouts/_footer.erb
@@ -24,7 +24,7 @@
</div>
<div class="copyright">
- Copyright © 2011-2017 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br>
+ Copyright © 2011-2018 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br>
Apache DataFu, DataFu, Apache Pig, Apache Hadoop, Hadoop, Apache, and the Apache feather logo are either registered trademarks or trademarks of the <a href="http://www.apache.org/">Apache Software Foundation</a> in the United States and other countries.
</div>
</div>
\ No newline at end of file
[8/8] incubator-datafu git commit: Merge branch '1.3.3'
Posted by mh...@apache.org.
Merge branch '1.3.3'
Project: http://git-wip-us.apache.org/repos/asf/incubator-datafu/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-datafu/commit/9bbf2a2b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-datafu/tree/9bbf2a2b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-datafu/diff/9bbf2a2b
Branch: refs/heads/master
Commit: 9bbf2a2bba6d7bec208391a0df8ee1bd2ca240f7
Parents: fa5c15a a73f884
Author: Matthew Hayes <mh...@apache.org>
Authored: Mon Jan 29 12:27:23 2018 -0800
Committer: Matthew Hayes <mh...@apache.org>
Committed: Mon Jan 29 12:27:23 2018 -0800
----------------------------------------------------------------------
LICENSE | 48 +--
NOTICE | 2 +-
changes.md | 18 +
datafu-hourglass/build.gradle | 6 +-
.../hourglass/avro/AvroMultipleInputsUtil.java | 34 +-
.../src/main/resources/META-INF/NOTICE | 2 +-
datafu-pig/src/main/resources/META-INF/NOTICE | 2 +-
gradle/dependency-versions.gradle | 2 +-
gradle/release.gradle | 15 +-
site/source/stylesheets/normalize.css | 375 -------------------
10 files changed, 55 insertions(+), 449 deletions(-)
----------------------------------------------------------------------
[4/8] incubator-datafu git commit: Fix minor indentation issues
Posted by mh...@apache.org.
Fix minor indentation issues
Project: http://git-wip-us.apache.org/repos/asf/incubator-datafu/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-datafu/commit/b52b1fe7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-datafu/tree/b52b1fe7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-datafu/diff/b52b1fe7
Branch: refs/heads/master
Commit: b52b1fe782f30dac917042a08f677c87003c731d
Parents: 42378d0
Author: Matthew Hayes <mh...@apache.org>
Authored: Thu Jan 18 15:24:34 2018 -0800
Committer: Matthew Hayes <mh...@apache.org>
Committed: Thu Jan 18 15:24:34 2018 -0800
----------------------------------------------------------------------
gradle/release.gradle | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-datafu/blob/b52b1fe7/gradle/release.gradle
----------------------------------------------------------------------
diff --git a/gradle/release.gradle b/gradle/release.gradle
index 3573c82..89db97d 100644
--- a/gradle/release.gradle
+++ b/gradle/release.gradle
@@ -35,10 +35,10 @@ if (!isRelease) {
task prepare_release_config(type: Copy) {
from "$rootDir/gradle.properties"
- // there is a bug in Gradle on Windows that prevents copy tasks from copying into the same folder.
- // Therefore, we copy to a temporary dir, and use the copy method (which doesn't have this bug)
- // to copy back into rootDir so the Windows build works, even though this is ugly.
- // https://discuss.gradle.org/t/error-with-a-copy-task-on-windows/1803
+ // There is a bug in Gradle on Windows that prevents copy tasks from copying into the same folder.
+ // Therefore, we copy to a temporary dir, and use the copy method (which doesn't have this bug)
+ // to copy back into rootDir so the Windows build works, even though this is ugly.
+ // https://discuss.gradle.org/t/error-with-a-copy-task-on-windows/1803
into temporaryDir
rename { filename ->
filename + ".release" }
@@ -50,13 +50,13 @@ task prepare_release_config(type: Copy) {
line
}
}
- doLast {
- copy {
- from temporaryDir
- into "$rootDir"
- include 'gradle.properties.release'
- }
- }
+ doLast {
+ copy {
+ from temporaryDir
+ into "$rootDir"
+ include 'gradle.properties.release'
+ }
+ }
}
task sourceRelease(type: Tar, dependsOn: prepare_release_config) {