incubator-griffin git commit: Fix minor literal issues and improve doc content
Repository: incubator-griffin Updated Branches: refs/heads/master b4f7d1551 -> 29b51997f Fix minor literal issues and improve doc content Author: Bolt Closes #459 from boltzjf/master. Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/29b51997 Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/29b51997 Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/29b51997 Branch: refs/heads/master Commit: 29b51997fd21c8b0c0f7c8e4c52118b3157598ea Parents: b4f7d15 Author: Bolt Authored: Wed Nov 21 09:20:40 2018 +0800 Committer: William Guo Committed: Wed Nov 21 09:20:40 2018 +0800 -- griffin-doc/service/mysql_postgresql_switch.md | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/29b51997/griffin-doc/service/mysql_postgresql_switch.md -- diff --git a/griffin-doc/service/mysql_postgresql_switch.md b/griffin-doc/service/mysql_postgresql_switch.md index 7511144..6c9c792 100644 --- a/griffin-doc/service/mysql_postgresql_switch.md +++ b/griffin-doc/service/mysql_postgresql_switch.md @@ -20,14 +20,14 @@ under the License. # Mysql and postgresql switch ## Overview -By default, Apache Griffin uses EclipseLink as the default JPA implementation. This document provides ways to switch mysql and postgresql. +Apache Griffin uses EclipseLink as the default JPA implementation, which supports two kinds of database, mysql and postgresql. This document mainly describes the steps of how to switch mysql and postgresql as backend database. -- [Use mysql database](#1.1) -- [Use postgresql database](#1.2) +- [Mysql database](#1.1) +- [Postgresql database](#1.2) -## Use mysql database +## Mysql database ### Add mysql dependency @@ -54,7 +54,7 @@ By default, Apache Griffin uses EclipseLink as the default JPA implementation. T -## Use postgresql database +## Postgresql database ### Add postgresql dependency
incubator-griffin git commit: [GRIFFIN-212] Add matchedFraction in streaming accuracy metrics
Repository: incubator-griffin
Updated Branches:
refs/heads/master 5c34a83f1 -> b4f7d1551
[GRIFFIN-212] Add matchedFraction in streaming accuracy metrics
Author: Lionel Liu
Closes #455 from bhlx3lyx7/util-update-0.3.
Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/b4f7d155
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/b4f7d155
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/b4f7d155
Branch: refs/heads/master
Commit: b4f7d1551cc4165a81f9cf9340b50c3099ee0f1b
Parents: 5c34a83
Author: Lionel Liu
Authored: Mon Nov 19 16:57:57 2018 +0800
Committer: William Guo
Committed: Mon Nov 19 16:57:57 2018 +0800
--
.../measure/context/streaming/metric/AccuracyMetric.scala| 4 +++-
.../apache/griffin/measure/step/transform/DataFrameOps.scala | 8 +---
2 files changed, 8 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/b4f7d155/measure/src/main/scala/org/apache/griffin/measure/context/streaming/metric/AccuracyMetric.scala
--
diff --git
a/measure/src/main/scala/org/apache/griffin/measure/context/streaming/metric/AccuracyMetric.scala
b/measure/src/main/scala/org/apache/griffin/measure/context/streaming/metric/AccuracyMetric.scala
index 19dfb9e..5065417 100644
---
a/measure/src/main/scala/org/apache/griffin/measure/context/streaming/metric/AccuracyMetric.scala
+++
b/measure/src/main/scala/org/apache/griffin/measure/context/streaming/metric/AccuracyMetric.scala
@@ -51,6 +51,8 @@ case class AccuracyMetric(miss: Long, total: Long) extends
Metric {
def getMatch: Long = total - miss
- def matchPercentage: Double = if (getTotal <= 0) 0 else getMatch.toDouble /
getTotal * 100
+ def matchFraction: Double = if (getTotal <= 0) 1 else getMatch.toDouble /
getTotal
+
+ def matchPercentage: Double = matchFraction * 100
}
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/b4f7d155/measure/src/main/scala/org/apache/griffin/measure/step/transform/DataFrameOps.scala
--
diff --git
a/measure/src/main/scala/org/apache/griffin/measure/step/transform/DataFrameOps.scala
b/measure/src/main/scala/org/apache/griffin/measure/step/transform/DataFrameOps.scala
index 088f328..ba64d33 100644
---
a/measure/src/main/scala/org/apache/griffin/measure/step/transform/DataFrameOps.scala
+++
b/measure/src/main/scala/org/apache/griffin/measure/step/transform/DataFrameOps.scala
@@ -21,8 +21,7 @@ package org.apache.griffin.measure.step.transform
import java.util.Date
import org.apache.spark.sql.{Encoders, Row, SQLContext, _}
-import org.apache.spark.sql.types.{BooleanType, LongType, StructField,
StructType}
-
+import org.apache.spark.sql.types._
import org.apache.griffin.measure.context.ContextId
import org.apache.griffin.measure.context.streaming.metric._
import
org.apache.griffin.measure.context.streaming.metric.CacheResults.CacheResult
@@ -43,6 +42,7 @@ object DataFrameOps {
val _miss = "miss"
val _total = "total"
val _matched = "matched"
+val _matchedFraction = "matchedFraction"
}
def fromJson(sqlContext: SQLContext,
@@ -70,6 +70,7 @@ object DataFrameOps {
val miss = details.getStringOrKey(_miss)
val total = details.getStringOrKey(_total)
val matched = details.getStringOrKey(_matched)
+val matchedFraction = details.getStringOrKey(_matchedFraction)
val updateTime = new Date().getTime
@@ -107,12 +108,13 @@ object DataFrameOps {
StructField(miss, LongType),
StructField(total, LongType),
StructField(matched, LongType),
+ StructField(matchedFraction, DoubleType),
StructField(ConstantColumns.record, BooleanType),
StructField(ConstantColumns.empty, BooleanType)
))
val rows = updatedResults.map { r =>
val ar = r.result.asInstanceOf[AccuracyMetric]
- Row(r.timeStamp, ar.miss, ar.total, ar.getMatch, !ar.initial,
ar.eventual)
+ Row(r.timeStamp, ar.miss, ar.total, ar.getMatch, ar.matchFraction,
!ar.initial, ar.eventual)
}.toArray
val rowRdd = sqlContext.sparkContext.parallelize(rows)
val retDf = sqlContext.createDataFrame(rowRdd, schema)
incubator-griffin git commit: revert
Repository: incubator-griffin
Updated Branches:
refs/heads/master 969f2eb74 -> 5c34a83f1
revert
Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/5c34a83f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/5c34a83f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/5c34a83f
Branch: refs/heads/master
Commit: 5c34a83f1e0fb8f2435f1de649b0224a437004af
Parents: 969f2eb
Author: William Guo
Authored: Mon Nov 19 16:55:15 2018 +0800
Committer: William Guo
Committed: Mon Nov 19 16:55:15 2018 +0800
--
merge_pr.py | 103 +++
1 file changed, 42 insertions(+), 61 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/5c34a83f/merge_pr.py
--
diff --git a/merge_pr.py b/merge_pr.py
index 00d9766..e2452a5 100755
--- a/merge_pr.py
+++ b/merge_pr.py
@@ -8,9 +8,9 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -31,26 +31,7 @@ import os
import re
import subprocess
import sys
-
-try:
-# Python3
-import urllib.request
-Request = urllib.request.Request
-urlopen = urllib.request.urlopen
-HTTPError = urllib.request.HTTPError
-except ImportError:
-# Python2
-import urllib2
-Request = urllib2.Request
-urlopen = urllib2.urlopen
-HTTPError = urllib2.HTTPError
-
-try:
-# raw_input was renamed as input in python3+
-input = raw_input
-except NameError:
-pass
-
+import urllib2
try:
import jira.client
@@ -88,28 +69,28 @@ PUSH_REPO =
"https://git-wip-us.apache.org/repos/asf/incubator-griffin.git";
def get_json(url):
try:
-request = Request(url)
+request = urllib2.Request(url)
if GITHUB_OAUTH_KEY:
request.add_header('Authorization', 'token %s' % GITHUB_OAUTH_KEY)
-return json.load(urlopen(request))
-except HTTPError as e:
+return json.load(urllib2.urlopen(request))
+except urllib2.HTTPError as e:
if "X-RateLimit-Remaining" in e.headers and
e.headers["X-RateLimit-Remaining"] == '0':
-print("Exceeded the GitHub API rate limit; see the instructions in
" + \
+print "Exceeded the GitHub API rate limit; see the instructions in
" + \
"merge_pr.py to configure an OAuth token for making
authenticated " + \
- "GitHub requests.")
+ "GitHub requests."
else:
-print("Unable to fetch URL, exiting: %s" % url)
+print "Unable to fetch URL, exiting: %s" % url
sys.exit(-1)
def fail(msg):
-print(msg)
+print msg
clean_up()
sys.exit(-1)
def run_cmd(cmd):
-print(cmd)
+print cmd
if isinstance(cmd, list):
return subprocess.check_output(cmd)
else:
@@ -117,13 +98,13 @@ def run_cmd(cmd):
def continue_maybe(prompt):
-result = input("\n%s (y/n): " % prompt)
+result = raw_input("\n%s (y/n): " % prompt)
if result.lower() != "y":
fail("Okay, exiting")
def clean_up():
-print("Restoring head pointer to %s" % original_head)
+print "Restoring head pointer to %s" % original_head
run_cmd("git checkout %s" % original_head)
ansi_escape = re.compile(r'\x1b[^m]*m')
@@ -131,7 +112,7 @@ def clean_up():
for branch in filter(lambda x: x.startswith(BRANCH_PREFIX), branches):
branch = ansi_escape.sub('', branch)
-print("Deleting local branch %s" % branch)
+print "Deleting local branch %s" % branch
run_cmd("git branch -D %s" % branch)
@@ -157,9 +138,9 @@ def merge_pr(pr_num, target_ref, title, body, pr_repo_desc):
'--pretty=format:%an <%ae>']).split("\n")
distinct_authors = sorted(set(commit_authors),
key=lambda x: commit_authors.count(x),
reverse=True)
-primary_author = input(
-"Enter primary author in the format of \"name \" [%s]: " %
-distinct_authors[0])
+primary_author = raw_input(
+"Enter primary author in the format of \"name \" [%s]: " %
+distinct_authors[0])
if primary_author == "":
primary_author = distinct_authors[0]
@@ -207,7 +188,7 @@ def merge_pr(pr_num, target_ref, title, body, pr_repo_desc):
def cherry_pick(pr_num, merge_hash, default_branch):
-p
incubator-griffin git commit: merge_pr.py python 3 support
Repository: incubator-griffin
Updated Branches:
refs/heads/master 466c71b80 -> 969f2eb74
merge_pr.py python 3 support
1. Import Request/urlopen/HTTPError from urllib.request to support python 3
2. The print statement has been replaced with a print() function
Author: fanqiaoqing
Closes #458 from IAmFQQ/merge_pr_python3_support.
Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/969f2eb7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/969f2eb7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/969f2eb7
Branch: refs/heads/master
Commit: 969f2eb74d315b7440a84cc78cc5c069067b91b6
Parents: 466c71b
Author: fanqiaoqing
Authored: Mon Nov 19 16:04:12 2018 +0800
Committer: William Guo
Committed: Mon Nov 19 16:04:12 2018 +0800
--
merge_pr.py | 91 ++--
1 file changed, 55 insertions(+), 36 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/969f2eb7/merge_pr.py
--
diff --git a/merge_pr.py b/merge_pr.py
index f485a31..00d9766 100755
--- a/merge_pr.py
+++ b/merge_pr.py
@@ -31,7 +31,26 @@ import os
import re
import subprocess
import sys
-import urllib2
+
+try:
+# Python3
+import urllib.request
+Request = urllib.request.Request
+urlopen = urllib.request.urlopen
+HTTPError = urllib.request.HTTPError
+except ImportError:
+# Python2
+import urllib2
+Request = urllib2.Request
+urlopen = urllib2.urlopen
+HTTPError = urllib2.HTTPError
+
+try:
+# raw_input was renamed as input in python3+
+input = raw_input
+except NameError:
+pass
+
try:
import jira.client
@@ -69,28 +88,28 @@ PUSH_REPO =
"https://git-wip-us.apache.org/repos/asf/incubator-griffin.git";
def get_json(url):
try:
-request = urllib2.Request(url)
+request = Request(url)
if GITHUB_OAUTH_KEY:
request.add_header('Authorization', 'token %s' % GITHUB_OAUTH_KEY)
-return json.load(urllib2.urlopen(request))
-except urllib2.HTTPError as e:
+return json.load(urlopen(request))
+except HTTPError as e:
if "X-RateLimit-Remaining" in e.headers and
e.headers["X-RateLimit-Remaining"] == '0':
-print "Exceeded the GitHub API rate limit; see the instructions in
" + \
+print("Exceeded the GitHub API rate limit; see the instructions in
" + \
"merge_pr.py to configure an OAuth token for making
authenticated " + \
- "GitHub requests."
+ "GitHub requests.")
else:
-print "Unable to fetch URL, exiting: %s" % url
+print("Unable to fetch URL, exiting: %s" % url)
sys.exit(-1)
def fail(msg):
-print msg
+print(msg)
clean_up()
sys.exit(-1)
def run_cmd(cmd):
-print cmd
+print(cmd)
if isinstance(cmd, list):
return subprocess.check_output(cmd)
else:
@@ -98,13 +117,13 @@ def run_cmd(cmd):
def continue_maybe(prompt):
-result = raw_input("\n%s (y/n): " % prompt)
+result = input("\n%s (y/n): " % prompt)
if result.lower() != "y":
fail("Okay, exiting")
def clean_up():
-print "Restoring head pointer to %s" % original_head
+print("Restoring head pointer to %s" % original_head)
run_cmd("git checkout %s" % original_head)
ansi_escape = re.compile(r'\x1b[^m]*m')
@@ -112,7 +131,7 @@ def clean_up():
for branch in filter(lambda x: x.startswith(BRANCH_PREFIX), branches):
branch = ansi_escape.sub('', branch)
-print "Deleting local branch %s" % branch
+print("Deleting local branch %s" % branch)
run_cmd("git branch -D %s" % branch)
@@ -138,7 +157,7 @@ def merge_pr(pr_num, target_ref, title, body, pr_repo_desc):
'--pretty=format:%an <%ae>']).split("\n")
distinct_authors = sorted(set(commit_authors),
key=lambda x: commit_authors.count(x),
reverse=True)
-primary_author = raw_input(
+primary_author = input(
"Enter primary author in the format of \"name \" [%s]: " %
distinct_authors[0])
if primary_author == "":
@@ -188,7 +207,7 @@ def merge_pr(pr_num, target_ref, title, body, pr_repo_desc):
def cherry_pick(pr_num, merge_hash, default_branch):
-pick_ref = raw_input("Enter a branch name [%s]: " % default_branch)
+pick_ref = input("Enter a branch name [%s]: " % default_branch)
if pick_ref == "":
pick_ref = default_branch
@@ -235,7 +254,7 @@ def resolve_jira_issue(merge_branches, comment,
default_jira_id="5"):
asf_jira = jira.client.JIRA({'server': JIRA_API_BASE},
incubator-griffin-site git commit: Updated asf-site site from master (9531fafdfb7c76257862f2a9e4fe2c81bf6ddcfd)
Repository: incubator-griffin-site Updated Branches: refs/heads/asf-site 8678fbc87 -> 7ef7b0501 Updated asf-site site from master (9531fafdfb7c76257862f2a9e4fe2c81bf6ddcfd) Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/commit/7ef7b050 Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/tree/7ef7b050 Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/diff/7ef7b050 Branch: refs/heads/asf-site Commit: 7ef7b050163479d2b041f7857167f2920d2f82b9 Parents: 8678fbc Author: Roy Lenferink Authored: Fri Nov 16 19:40:01 2018 +0100 Committer: Roy Lenferink Committed: Fri Nov 16 19:40:01 2018 +0100 -- css/animate.css | 0 css/bootstrap.min.css| 0 css/colorbox.css | 0 css/misc.css | 0 css/style.css| 0 css/styles.css | 0 data/batch/gen-hive-data.sh | 0 data/batch/gen_delta_src.sh | 0 data/batch/gen_demo_data.sh | 0 data/streaming/gen-data.sh | 0 data/streaming/streaming-data.sh | 0 docs/community.html | 13 + docs/conf.html | 13 + docs/contribute.html | 13 + docs/contributors.html | 13 + docs/download.html | 13 + docs/latest.html | 13 + docs/profiling.html | 13 + docs/quickstart.html | 13 + docs/usecases.html | 13 + fonts/flexslider-icon.eot| Bin fonts/flexslider-icon.svg| 0 fonts/flexslider-icon.ttf| Bin fonts/flexslider-icon.woff | Bin images/close.png | Bin images/controls.png | Bin images/loading.gif | Bin images/next.png | Bin images/previous.png | Bin images/step1.png | Bin images/step2.png | Bin images/step3.png | Bin images/step4.png | Bin index.html | 32 +++- js/jquery-1.11.1.min.js | 0 35 files changed, 108 insertions(+), 41 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/7ef7b050/css/animate.css -- diff --git a/css/animate.css b/css/animate.css old mode 100755 new mode 100644 http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/7ef7b050/css/bootstrap.min.css -- diff --git a/css/bootstrap.min.css b/css/bootstrap.min.css old mode 100755 new mode 100644 http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/7ef7b050/css/colorbox.css -- diff --git a/css/colorbox.css b/css/colorbox.css old mode 100755 new mode 100644 http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/7ef7b050/css/misc.css -- diff --git a/css/misc.css b/css/misc.css old mode 100755 new mode 100644 http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/7ef7b050/css/style.css -- diff --git a/css/style.css b/css/style.css old mode 100755 new mode 100644 http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/7ef7b050/css/styles.css -- diff --git a/css/styles.css b/css/styles.css old mode 100755 new mode 100644 http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/7ef7b050/data/batch/gen-hive-data.sh -- diff --git a/data/batch/gen-hive-data.sh b/data/batch/gen-hive-data.sh old mode 100755 new mode 100644 http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/7ef7b050/data/batch/gen_delta_src.sh -- diff --git a/data/batch/gen_delta_src.sh b/data/batch/gen_delta_src.sh old mode 100755 new mode 100644 http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/7ef7b050/data/batch/gen_demo_data.sh -- diff --git a/data/batch/gen_demo_data.sh b/data/batch/gen_demo_data.sh old mode 100755 new mode 100644 http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/7ef7b050/data/streaming/gen-data.sh -- diff --git a/data/streaming/gen-da
incubator-griffin-site git commit: Fixes to comply with whimsy website checker
Repository: incubator-griffin-site Updated Branches: refs/heads/master ae30ff7f9 -> 9531fafdf Fixes to comply with whimsy website checker Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/commit/9531fafd Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/tree/9531fafd Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/diff/9531fafd Branch: refs/heads/master Commit: 9531fafdfb7c76257862f2a9e4fe2c81bf6ddcfd Parents: ae30ff7 Author: Roy Lenferink Authored: Fri Nov 16 19:39:41 2018 +0100 Committer: Roy Lenferink Committed: Fri Nov 16 19:39:41 2018 +0100 -- _includes/footer.html | 13 + index.html| 32 +++- 2 files changed, 36 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/9531fafd/_includes/footer.html -- diff --git a/_includes/footer.html b/_includes/footer.html index 3b81c0d..5741604 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -8,15 +8,20 @@ -Apache Griffin is an effort undergoing incubation at The http://www.apache.org";>Apache Software Foundation (ASF)sponsored by the Apache Incubator PMC. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF. Apache Griffin (incubating) is available under the https://www.apache.org/licenses";>Apache License, version 2.0. +Apache Griffin is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF. - - -Copyright © 2018 The Apache Software Foundation. All Rights Reserved. Apache, Apache Griffin and the Apache feather logo are trademarks of The Apache Software Foundation. + +Copyright © 2018 The Apache Software Foundation, Licensed under the http://www.apache.org/licenses/LICENSE-2.0";>Apache License, Version 2.0. + Apache Griffin, Griffin, Apache, the Apache feather logo and the Apache Griffin logo are trademarks of The Apache Software Foundation. + + https://www.apache.org/events/current-event.html";> + https://www.apache.org/events/current-event-234x60.png"; alt="ASF Current Event"> + + http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/9531fafd/index.html -- diff --git a/index.html b/index.html index 10c25fc..2317b06 100755 --- a/index.html +++ b/index.html @@ -1,5 +1,22 @@ + Apache Griffin @@ -265,7 +282,7 @@ https://www.apache.org/"; target="_blank">Foundation -https://www.apache.org/licenses/LICENSE-2.0"; target="_blank">License +https://www.apache.org/licenses/"; target="_blank">License https://www.apache.org/foundation/sponsorship"; target="_blank">Sponsorship https://www.apache.org/security"; target="_blank">Security https://www.apache.org/foundation/thanks"; target="_blank">Thanks @@ -288,15 +305,20 @@ -Apache Griffin is an effort undergoing incubation at The http://www.apache.org";>Apache Software Foundation (ASF)sponsored by the Apache Incubator PMC. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not nece
incubator-griffin git commit: [SERVICE] JobInstace setJobInstanceIdAndUri, update instance.setAppU…
Repository: incubator-griffin
Updated Branches:
refs/heads/master c0a387de6 -> 466c71b80
[SERVICE] JobInstace setJobInstanceIdAndUri, update instance.setAppUâ¦
GRIFFIN-211 [Service] JobInstance appUrl error
Author: justACT
Closes #454 from justACT/newmaster.
Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/466c71b8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/466c71b8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/466c71b8
Branch: refs/heads/master
Commit: 466c71b80161f1f4047a14fa511c656277acfd24
Parents: c0a387d
Author: justACT
Authored: Fri Nov 16 10:23:04 2018 +0800
Committer: William Guo
Committed: Fri Nov 16 10:23:04 2018 +0800
--
.../src/main/java/org/apache/griffin/core/job/JobServiceImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/466c71b8/service/src/main/java/org/apache/griffin/core/job/JobServiceImpl.java
--
diff --git
a/service/src/main/java/org/apache/griffin/core/job/JobServiceImpl.java
b/service/src/main/java/org/apache/griffin/core/job/JobServiceImpl.java
index 4768efc..69f965f 100644
--- a/service/src/main/java/org/apache/griffin/core/job/JobServiceImpl.java
+++ b/service/src/main/java/org/apache/griffin/core/job/JobServiceImpl.java
@@ -604,7 +604,7 @@ public class JobServiceImpl implements JobService {
()));
instance.setAppId(appId == null ? null : appId.toString());
instance.setAppUri(appId == null ? null : env
-.getProperty("yarn.uri") + " /cluster/app/ " + appId);
+.getProperty("yarn.uri") + "/cluster/app/" + appId);
instanceRepo.save(instance);
}
}
incubator-griffin git commit: Fixservicetests
Repository: incubator-griffin
Updated Branches:
refs/heads/master e16ce3c0e -> c0a387de6
Fixservicetests
Author: William Guo
Closes #453 from guoyuepeng/fixservicetests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/c0a387de
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/c0a387de
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/c0a387de
Branch: refs/heads/master
Commit: c0a387de6b75e6e2df3166b551feb4367881e51f
Parents: e16ce3c
Author: William Guo
Authored: Thu Nov 15 20:23:55 2018 +0800
Committer: William Guo
Committed: Thu Nov 15 20:23:55 2018 +0800
--
.../griffin/core/job/EventServiceTest.java | 6 +-
.../griffin/core/job/JobControllerTest.java | 2 +-
.../griffin/core/job/JobInstanceTest.java | 8 +-
.../griffin/core/job/SparkSubmitJobTest.java| 10 +-
.../ExternalMeasureOperatorImplTest.java| 2 +-
.../measure/GriffinMeasureOperatorImplTest.java | 4 +-
.../core/measure/MeasureControllerTest.java | 2 +-
.../core/measure/MeasureOrgServiceImplTest.java | 4 +-
.../core/measure/MeasureServiceImplTest.java| 4 +-
.../measure/repo/DataConnectorRepoTest.java | 2 +-
.../core/measure/repo/MeasureRepoTest.java | 2 +-
.../core/metric/MetricServiceImplTest.java | 4 +-
.../apache/griffin/core/util/EntityHelper.java | 258 ---
.../griffin/core/util/EntityMocksHelper.java| 258 +++
14 files changed, 283 insertions(+), 283 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/c0a387de/service/src/test/java/org/apache/griffin/core/job/EventServiceTest.java
--
diff --git
a/service/src/test/java/org/apache/griffin/core/job/EventServiceTest.java
b/service/src/test/java/org/apache/griffin/core/job/EventServiceTest.java
index 2cbbd84..bcd5356 100644
--- a/service/src/test/java/org/apache/griffin/core/job/EventServiceTest.java
+++ b/service/src/test/java/org/apache/griffin/core/job/EventServiceTest.java
@@ -19,7 +19,7 @@ under the License.
package org.apache.griffin.core.job;
-import static org.apache.griffin.core.util.EntityHelper.createGriffinMeasure;
+import static
org.apache.griffin.core.util.EntityMocksHelper.createGriffinMeasure;
import java.util.ArrayList;
import java.util.List;
@@ -33,7 +33,7 @@ import org.apache.griffin.core.job.entity.BatchJob;
import org.apache.griffin.core.job.entity.JobDataSegment;
import org.apache.griffin.core.measure.entity.GriffinMeasure;
import org.apache.griffin.core.measure.entity.Measure;
-import org.apache.griffin.core.util.EntityHelper;
+import org.apache.griffin.core.util.EntityMocksHelper;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -68,7 +68,7 @@ public class EventServiceTest {
@Test
public void testAddJobEvent() throws Exception {
-BatchJob batch_Job = EntityHelper.createGriffinJob();
+BatchJob batch_Job = EntityMocksHelper.createGriffinJob();
batch_Job.setCronExpression("0 0 12 * * ?");
batch_Job.setTimeZone("Asia/Shanghai");
JobDataSegment jds = new JobDataSegment();
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/c0a387de/service/src/test/java/org/apache/griffin/core/job/JobControllerTest.java
--
diff --git
a/service/src/test/java/org/apache/griffin/core/job/JobControllerTest.java
b/service/src/test/java/org/apache/griffin/core/job/JobControllerTest.java
index 380c105..0bd74e6 100644
--- a/service/src/test/java/org/apache/griffin/core/job/JobControllerTest.java
+++ b/service/src/test/java/org/apache/griffin/core/job/JobControllerTest.java
@@ -21,7 +21,7 @@ package org.apache.griffin.core.job;
import static
org.apache.griffin.core.exception.GriffinExceptionMessage.JOB_ID_DOES_NOT_EXIST;
import static
org.apache.griffin.core.exception.GriffinExceptionMessage.JOB_NAME_DOES_NOT_EXIST;
-import static org.apache.griffin.core.util.EntityHelper.createGriffinJob;
+import static org.apache.griffin.core.util.EntityMocksHelper.createGriffinJob;
import static org.hamcrest.CoreMatchers.is;
import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.doNothing;
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/c0a387de/service/src/test/java/org/apache/griffin/core/job/JobInstanceTest.java
--
diff --git
a/service/src/test/java/org/apache/griffin/core/job/JobInstanceTest.java
b/service/src/test/java/org/apache/griffin/core/job/JobInstanceTest.java
index d20cf3e..8e618de 100644
--- a/service/src/test/java/org/apache/g
incubator-griffin git commit: [GRIFFIN-209] update param util, add UT for param util
Repository: incubator-griffin
Updated Branches:
refs/heads/master f1781ab8b -> e16ce3c0e
[GRIFFIN-209] update param util, add UT for param util
Author: Lionel Liu
Closes #452 from bhlx3lyx7/param-util.
Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/e16ce3c0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/e16ce3c0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/e16ce3c0
Branch: refs/heads/master
Commit: e16ce3c0e2b345966406d983d86f46c17f86c295
Parents: f1781ab
Author: Lionel Liu
Authored: Wed Nov 14 22:33:29 2018 +0800
Committer: William Guo
Committed: Wed Nov 14 22:33:29 2018 +0800
--
.../dsl/transform/TimelinessExpr2DQSteps.scala | 2 +-
.../griffin/measure/utils/ParamUtil.scala | 267 ++-
.../griffin/measure/utils/ParamUtilTest.scala | 102 +++
3 files changed, 248 insertions(+), 123 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/e16ce3c0/measure/src/main/scala/org/apache/griffin/measure/step/builder/dsl/transform/TimelinessExpr2DQSteps.scala
--
diff --git
a/measure/src/main/scala/org/apache/griffin/measure/step/builder/dsl/transform/TimelinessExpr2DQSteps.scala
b/measure/src/main/scala/org/apache/griffin/measure/step/builder/dsl/transform/TimelinessExpr2DQSteps.scala
index 3731da9..71eb452 100644
---
a/measure/src/main/scala/org/apache/griffin/measure/step/builder/dsl/transform/TimelinessExpr2DQSteps.scala
+++
b/measure/src/main/scala/org/apache/griffin/measure/step/builder/dsl/transform/TimelinessExpr2DQSteps.scala
@@ -231,7 +231,7 @@ case class TimelinessExpr2DQSteps(context: DQContext,
}
private def getPercentiles(details: Map[String, Any]): Seq[Double] = {
-details.getArr[Double](_percentileValues).filter(d => (d >= 0 && d <= 1))
+details.getDoubleArr(_percentileValues).filter(d => (d >= 0 && d <= 1))
}
}
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/e16ce3c0/measure/src/main/scala/org/apache/griffin/measure/utils/ParamUtil.scala
--
diff --git
a/measure/src/main/scala/org/apache/griffin/measure/utils/ParamUtil.scala
b/measure/src/main/scala/org/apache/griffin/measure/utils/ParamUtil.scala
index c4420ef..283d7d1 100644
--- a/measure/src/main/scala/org/apache/griffin/measure/utils/ParamUtil.scala
+++ b/measure/src/main/scala/org/apache/griffin/measure/utils/ParamUtil.scala
@@ -19,193 +19,215 @@ under the License.
package org.apache.griffin.measure.utils
import scala.reflect.ClassTag
+import scala.util.Try
object ParamUtil {
- implicit class ParamMap(params: Map[String, Any]) {
-def getAny(key: String, defValue: Any): Any = {
- params.get(key) match {
-case Some(v) => v
-case _ => defValue
+ object TransUtil {
+def toAny(value: Any): Option[Any] = Some(value)
+def toAnyRef[T: ClassTag](value: Any): Option[T] = {
+ value match {
+case v: T => Some(v)
+case _ => None
}
}
-
-def getAnyRef[T: ClassTag](key: String, defValue: T): T = {
- params.get(key) match {
-case Some(v: T) => v
-case _ => defValue
+def toStringOpt(value: Any): Option[String] = {
+ value match {
+case v: String => Some(v)
+case v => Some(v.toString)
}
}
-
-def getString(key: String, defValue: String): String = {
+def toByte(value: Any): Option[Byte] = {
try {
-params.get(key) match {
- case Some(v: String) => v
- case Some(v) => v.toString
- case _ => defValue
+value match {
+ case v: String => Some(v.toByte)
+ case v: Byte => Some(v.toByte)
+ case v: Short => Some(v.toByte)
+ case v: Int => Some(v.toByte)
+ case v: Long => Some(v.toByte)
+ case v: Float => Some(v.toByte)
+ case v: Double => Some(v.toByte)
+ case _ => None
}
} catch {
-case _: NumberFormatException => defValue
+case _: NumberFormatException => None
}
}
-
-def getLazyString(key: String, defValue: () => String): String = {
+def toShort(value: Any): Option[Short] = {
try {
-params.get(key) match {
- case Some(v: String) => v
- case Some(v) => v.toString
- case _ => defValue()
+value match {
+ case v: String => Some(v.toShort)
+ case v: Byte => Some(v.toShort)
+ case v: Short => Some(v.toShort)
+ case v: Int => Some(v.toShort)
+ case v: Long => Some(v.toShort)
+ case v: Float => Some(v.toShort)
+ case v: Double => Some(v.toSho
incubator-griffin git commit: Define griffin plain-vanilla hook.
Repository: incubator-griffin
Updated Branches:
refs/heads/master 165ef3ded -> f1781ab8b
Define griffin plain-vanilla hook.
the purpose of hook is for integration with components outside. Griffin would
offer information about internal task status.
Task: GRIFFIN-200
Author: Eugene
Author: William Guo
Closes #444 from toyboxman/hook.
Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/f1781ab8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/f1781ab8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/f1781ab8
Branch: refs/heads/master
Commit: f1781ab8bc06426425a3f9f50f612f7f5ad03379
Parents: 165ef3d
Author: Eugene
Authored: Fri Nov 9 22:46:40 2018 +0800
Committer: William Guo
Committed: Fri Nov 9 22:46:40 2018 +0800
--
.../griffin/core/event/EventPointcutType.java | 26 +++
.../griffin/core/event/EventSourceType.java | 25 +++
.../apache/griffin/core/event/EventType.java| 26 +++
.../core/event/GriffinAbstractEvent.java| 57 ++
.../apache/griffin/core/event/GriffinEvent.java | 54 ++
.../griffin/core/event/GriffinEventManager.java | 59 ++
.../apache/griffin/core/event/GriffinHook.java | 42 +
.../org/apache/griffin/core/event/JobEvent.java | 60 ++
.../apache/griffin/core/event/JobEventHook.java | 31
.../core/exception/GriffinException.java| 5 +
.../apache/griffin/core/job/JobServiceImpl.java | 183 ++-
.../src/main/resources/application.properties | 2 +
.../griffin/core/job/EventServiceTest.java | 107 +++
.../src/test/resources/application.properties | 8 +-
14 files changed, 599 insertions(+), 86 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/f1781ab8/service/src/main/java/org/apache/griffin/core/event/EventPointcutType.java
--
diff --git
a/service/src/main/java/org/apache/griffin/core/event/EventPointcutType.java
b/service/src/main/java/org/apache/griffin/core/event/EventPointcutType.java
new file mode 100644
index 000..166372d
--- /dev/null
+++ b/service/src/main/java/org/apache/griffin/core/event/EventPointcutType.java
@@ -0,0 +1,26 @@
+/*
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+package org.apache.griffin.core.event;
+
+public enum EventPointcutType {
+BEFORE,
+PENDING,
+AFTER
+}
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/f1781ab8/service/src/main/java/org/apache/griffin/core/event/EventSourceType.java
--
diff --git
a/service/src/main/java/org/apache/griffin/core/event/EventSourceType.java
b/service/src/main/java/org/apache/griffin/core/event/EventSourceType.java
new file mode 100644
index 000..6bca570
--- /dev/null
+++ b/service/src/main/java/org/apache/griffin/core/event/EventSourceType.java
@@ -0,0 +1,25 @@
+/*
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+package org.apache.griffin.core.event;
+
+public enum EventSourceType {
+JOB,
+MEASURE
+}
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/f1781ab8/service/src/main/java/org/apache/griffin/core/event/EventType.java
--
diff --git a/
incubator-griffin-site git commit: Updated asf-site site from master (ae30ff7f98cb82f980156f6035b5875a71fd8ba1)
Repository: incubator-griffin-site Updated Branches: refs/heads/asf-site dbf8feb77 -> 8678fbc87 Updated asf-site site from master (ae30ff7f98cb82f980156f6035b5875a71fd8ba1) Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/commit/8678fbc8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/tree/8678fbc8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/diff/8678fbc8 Branch: refs/heads/asf-site Commit: 8678fbc8710d6d5c761cc61c77cdf8f545cc417e Parents: dbf8feb Author: William Guo Authored: Thu Nov 1 19:53:26 2018 +0800 Committer: William Guo Committed: Thu Nov 1 19:53:26 2018 +0800 -- index.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/8678fbc8/index.html -- diff --git a/index.html b/index.html index a6f8ce8..10c25fc 100755 --- a/index.html +++ b/index.html @@ -229,7 +229,7 @@ COMMUNITY - + Contribution Get help using Apache Griffin or contribute to the project @@ -249,7 +249,7 @@ - + Events Learn more about Apache Griffin from Conferences @@ -259,7 +259,7 @@ - + Apache Software Foundation
incubator-griffin-site git commit: fix community layout
Repository: incubator-griffin-site Updated Branches: refs/heads/master ab3806037 -> ae30ff7f9 fix community layout Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/commit/ae30ff7f Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/tree/ae30ff7f Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/diff/ae30ff7f Branch: refs/heads/master Commit: ae30ff7f98cb82f980156f6035b5875a71fd8ba1 Parents: ab38060 Author: William Guo Authored: Thu Nov 1 19:46:41 2018 +0800 Committer: William Guo Committed: Thu Nov 1 19:46:41 2018 +0800 -- index.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/ae30ff7f/index.html -- diff --git a/index.html b/index.html index a6f8ce8..10c25fc 100755 --- a/index.html +++ b/index.html @@ -229,7 +229,7 @@ COMMUNITY - + Contribution Get help using Apache Griffin or contribute to the project @@ -249,7 +249,7 @@ - + Events Learn more about Apache Griffin from Conferences @@ -259,7 +259,7 @@ - + Apache Software Foundation
[2/2] incubator-griffin-site git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-griffin-site
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-griffin-site Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/commit/ab380603 Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/tree/ab380603 Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/diff/ab380603 Branch: refs/heads/master Commit: ab3806037fbb5d3b2f457d4e701238b55da433f0 Parents: 820270a e978710 Author: William Guo Authored: Thu Nov 1 19:28:26 2018 +0800 Committer: William Guo Committed: Thu Nov 1 19:28:26 2018 +0800 -- --
[1/2] incubator-griffin-site git commit: revert
Repository: incubator-griffin-site
Updated Branches:
refs/heads/master e97871049 -> ab3806037
revert
Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/repo
Commit:
http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/commit/820270ad
Tree:
http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/tree/820270ad
Diff:
http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/diff/820270ad
Branch: refs/heads/master
Commit: 820270ad4448a65d8dd6872f02b03b5eb9623adc
Parents: 1f4b5ff
Author: William Guo
Authored: Thu Nov 1 19:28:04 2018 +0800
Committer: William Guo
Committed: Thu Nov 1 19:28:04 2018 +0800
--
css/style.css | 17 -
index.html| 18 +-
2 files changed, 25 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/820270ad/css/style.css
--
diff --git a/css/style.css b/css/style.css
index 94e8d60..7dc9ddc 100755
--- a/css/style.css
+++ b/css/style.css
@@ -72,7 +72,22 @@ h4{font-size:18px; font-weight:500;}
.service_title{font-size:18px; margin:15px 0 5px 0; color:#575757;}
.workwrapper{width:100%; padding:70px 0 50px 0; text-align:center;}
-.workmargin{margin-bottom:50px;}
+/*.workmargin{margin-bottom:50px;}*/
+.workmargin {
+ width:100%;
+overflow: hidden;
+ margin-bottom:50px;
+}
+@media only screen and (max-width: 767px)
+{
+.one, .two, .three, .four
+{
+display: block;
+float: none;
+width: 100%;
+padding: 20px 0;
+}
+}
.workbox{float:left;}
.workbox img{width:100%;}
.worktitle{margin-top:15%; font-size:18px; font-weight:bold; color:#ff;}
http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/820270ad/index.html
--
diff --git a/index.html b/index.html
index 9e6990b..a6f8ce8 100755
--- a/index.html
+++ b/index.html
@@ -6,7 +6,7 @@
-
+
@@ -195,24 +195,24 @@
WHO USES Apache Griffin
-http://www.ebay.com/";>http://www.ebay.com/";>
-http://www.huawei.com/";>http://www.huawei.com/";>
-http://www.jd.com/";>http://www.jd.com/";>
-http://bank.pingan.com/";>http://bank.pingan.com/";>
-http://www.paypal.com/";>http://www.paypal.com/";>
-http://www.vip.com/";>http://www.vip.com/";>
-https://www.vmware.com/";>https://www.vmware.com/";>
-https://www.expedia.com/";>https://www.expedia.com/";>
incubator-griffin-site git commit: Updated asf-site site from master (e97871049bc17092bf321a8971b95a16f43bf353)
Repository: incubator-griffin-site
Updated Branches:
refs/heads/asf-site 77230ad74 -> dbf8feb77
Updated asf-site site from master (e97871049bc17092bf321a8971b95a16f43bf353)
Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/repo
Commit:
http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/commit/dbf8feb7
Tree:
http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/tree/dbf8feb7
Diff:
http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/diff/dbf8feb7
Branch: refs/heads/asf-site
Commit: dbf8feb776aae1f026b7a4e8c8a3e6994587a378
Parents: 77230ad
Author: William Guo
Authored: Thu Nov 1 19:21:35 2018 +0800
Committer: William Guo
Committed: Thu Nov 1 19:21:35 2018 +0800
--
css/style.css | 17 -
index.html| 18 +-
2 files changed, 25 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/dbf8feb7/css/style.css
--
diff --git a/css/style.css b/css/style.css
index 94e8d60..7dc9ddc 100755
--- a/css/style.css
+++ b/css/style.css
@@ -72,7 +72,22 @@ h4{font-size:18px; font-weight:500;}
.service_title{font-size:18px; margin:15px 0 5px 0; color:#575757;}
.workwrapper{width:100%; padding:70px 0 50px 0; text-align:center;}
-.workmargin{margin-bottom:50px;}
+/*.workmargin{margin-bottom:50px;}*/
+.workmargin {
+ width:100%;
+overflow: hidden;
+ margin-bottom:50px;
+}
+@media only screen and (max-width: 767px)
+{
+.one, .two, .three, .four
+{
+display: block;
+float: none;
+width: 100%;
+padding: 20px 0;
+}
+}
.workbox{float:left;}
.workbox img{width:100%;}
.worktitle{margin-top:15%; font-size:18px; font-weight:bold; color:#ff;}
http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/dbf8feb7/index.html
--
diff --git a/index.html b/index.html
index 9e6990b..a6f8ce8 100755
--- a/index.html
+++ b/index.html
@@ -6,7 +6,7 @@
-
+
@@ -195,24 +195,24 @@
WHO USES Apache Griffin
-http://www.ebay.com/";>http://www.ebay.com/";>
-http://www.huawei.com/";>http://www.huawei.com/";>
-http://www.jd.com/";>http://www.jd.com/";>
-http://bank.pingan.com/";>http://bank.pingan.com/";>
-http://www.paypal.com/";>http://www.paypal.com/";>
-http://www.vip.com/";>http://www.vip.com/";>
-https://www.vmware.com/";>https://www.vmware.com/";>
-https://www.expedia.com/";>https://www.expedia.com/";>
incubator-griffin-site git commit: Fix layout issue when on mobile
Repository: incubator-griffin-site
Updated Branches:
refs/heads/master 1f4b5ffce -> e97871049
Fix layout issue when on mobile
Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/repo
Commit:
http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/commit/e9787104
Tree:
http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/tree/e9787104
Diff:
http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/diff/e9787104
Branch: refs/heads/master
Commit: e97871049bc17092bf321a8971b95a16f43bf353
Parents: 1f4b5ff
Author: Li, Juan
Authored: Thu Nov 1 18:55:30 2018 +0800
Committer: Li, Juan
Committed: Thu Nov 1 18:55:30 2018 +0800
--
css/style.css | 17 -
index.html| 18 +-
2 files changed, 25 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/e9787104/css/style.css
--
diff --git a/css/style.css b/css/style.css
index 94e8d60..7dc9ddc 100755
--- a/css/style.css
+++ b/css/style.css
@@ -72,7 +72,22 @@ h4{font-size:18px; font-weight:500;}
.service_title{font-size:18px; margin:15px 0 5px 0; color:#575757;}
.workwrapper{width:100%; padding:70px 0 50px 0; text-align:center;}
-.workmargin{margin-bottom:50px;}
+/*.workmargin{margin-bottom:50px;}*/
+.workmargin {
+ width:100%;
+overflow: hidden;
+ margin-bottom:50px;
+}
+@media only screen and (max-width: 767px)
+{
+.one, .two, .three, .four
+{
+display: block;
+float: none;
+width: 100%;
+padding: 20px 0;
+}
+}
.workbox{float:left;}
.workbox img{width:100%;}
.worktitle{margin-top:15%; font-size:18px; font-weight:bold; color:#ff;}
http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/e9787104/index.html
--
diff --git a/index.html b/index.html
index 9e6990b..a6f8ce8 100755
--- a/index.html
+++ b/index.html
@@ -6,7 +6,7 @@
-
+
@@ -195,24 +195,24 @@
WHO USES Apache Griffin
-http://www.ebay.com/";>http://www.ebay.com/";>
-http://www.huawei.com/";>http://www.huawei.com/";>
-http://www.jd.com/";>http://www.jd.com/";>
-http://bank.pingan.com/";>http://bank.pingan.com/";>
-http://www.paypal.com/";>http://www.paypal.com/";>
-http://www.vip.com/";>http://www.vip.com/";>
-https://www.vmware.com/";>https://www.vmware.com/";>
-https://www.expedia.com/";>https://www.expedia.com/";>
incubator-griffin-site git commit: Updated asf-site site from master (1f4b5ffcebdc9889f41ad73b665831ba50f1df74)
Repository: incubator-griffin-site Updated Branches: refs/heads/asf-site 69c7309b5 -> 77230ad74 Updated asf-site site from master (1f4b5ffcebdc9889f41ad73b665831ba50f1df74) Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/commit/77230ad7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/tree/77230ad7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/diff/77230ad7 Branch: refs/heads/asf-site Commit: 77230ad74dae2406a7521556028921d9ddda264e Parents: 69c7309 Author: William Guo Authored: Thu Nov 1 12:58:44 2018 +0800 Committer: William Guo Committed: Thu Nov 1 12:58:44 2018 +0800 -- docs/community.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/77230ad7/docs/community.html -- diff --git a/docs/community.html b/docs/community.html index 6c3839d..1408b46 100644 --- a/docs/community.html +++ b/docs/community.html @@ -234,7 +234,7 @@ under the License. Alex Lv alexlv alexatapache - eBay + Alibaba PPMC
incubator-griffin-site git commit: fix org error
Repository: incubator-griffin-site Updated Branches: refs/heads/master fdde5d2b6 -> 1f4b5ffce fix org error Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/commit/1f4b5ffc Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/tree/1f4b5ffc Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/diff/1f4b5ffc Branch: refs/heads/master Commit: 1f4b5ffcebdc9889f41ad73b665831ba50f1df74 Parents: fdde5d2 Author: William Guo Authored: Thu Nov 1 12:55:15 2018 +0800 Committer: William Guo Committed: Thu Nov 1 12:55:15 2018 +0800 -- community.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/1f4b5ffc/community.md -- diff --git a/community.md b/community.md index c3804d8..f2c062e 100644 --- a/community.md +++ b/community.md @@ -24,7 +24,7 @@ permalink: /docs/community.html | Name | Apacheid | Githubid | Org | Role | |--|--|-|---|-| -| Alex Lv | alexlv | alexatapache | eBay | PPMC | +| Alex Lv | alexlv | alexatapache | Alibaba | PPMC | | Eugene Liu | liujin | toyboxman | VMWARE | Committer | | Grant | xuexu | grant-xuexu | Ontario Institute for Cancer Research | Committer | | He Wang | wanghe | whhe | NetEase(ç½æ) | Committer |
incubator-griffin git commit: [GRIFFIN-208] log exception details when it makes sense
Repository: incubator-griffin
Updated Branches:
refs/heads/master bcfd0e269 -> 165ef3ded
[GRIFFIN-208] log exception details when it makes sense
Sometimes error messages are not descriptive enough and do not allow
to pinpoint exact issue. Exception stack traces should make it easier
to troubleshoot issues.
Author: Nikolay Sokolov
Closes #448 from chemikadze/GRIFFIN-208.
Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/165ef3de
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/165ef3de
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/165ef3de
Branch: refs/heads/master
Commit: 165ef3ded15f77657b996c9a1e7c79ccee0a3fb1
Parents: bcfd0e2
Author: Nikolay Sokolov
Authored: Tue Oct 30 15:08:18 2018 +0800
Committer: William Guo
Committed: Tue Oct 30 15:08:18 2018 +0800
--
.../apache/griffin/measure/Application.scala| 22 +---
.../org/apache/griffin/measure/Loggable.scala | 8 +++
.../datasource/connector/DataConnector.scala| 2 +-
.../batch/AvroBatchDataConnector.scala | 2 +-
.../batch/HiveBatchDataConnector.scala | 2 +-
.../batch/TextDirBatchDataConnector.scala | 2 +-
.../org/apache/griffin/measure/job/DQJob.scala | 3 +++
.../apache/griffin/measure/launch/DQApp.scala | 5 -
.../measure/launch/batch/BatchDQApp.scala | 6 --
.../launch/streaming/StreamingDQApp.scala | 3 ++-
.../measure/sink/ElasticSearchSink.scala| 2 +-
.../apache/griffin/measure/sink/HdfsSink.scala | 14 ++---
.../apache/griffin/measure/sink/MongoSink.scala | 2 +-
.../griffin/measure/sink/MultiSinks.scala | 8 +++
.../griffin/measure/sink/SinkTaskRunner.scala | 4 ++--
.../apache/griffin/measure/step/DQStep.scala| 3 +++
.../apache/griffin/measure/step/SeqDQStep.scala | 3 +++
.../step/builder/GriffinDslDQStepBuilder.scala | 2 +-
.../transform/DataFrameOpsTransformStep.scala | 2 +-
.../step/transform/SparkSqlTransformStep.scala | 2 +-
.../step/write/DataSourceUpdateWriteStep.scala | 2 +-
.../measure/step/write/MetricFlushStep.scala| 2 +-
.../measure/step/write/MetricWriteStep.scala| 2 +-
.../measure/step/write/RecordWriteStep.scala| 2 +-
.../apache/griffin/measure/utils/FSUtil.scala | 2 +-
.../apache/griffin/measure/utils/HdfsUtil.scala | 4 ++--
26 files changed, 70 insertions(+), 41 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/165ef3de/measure/src/main/scala/org/apache/griffin/measure/Application.scala
--
diff --git
a/measure/src/main/scala/org/apache/griffin/measure/Application.scala
b/measure/src/main/scala/org/apache/griffin/measure/Application.scala
index 1bac17b..99c6a25 100644
--- a/measure/src/main/scala/org/apache/griffin/measure/Application.scala
+++ b/measure/src/main/scala/org/apache/griffin/measure/Application.scala
@@ -51,13 +51,13 @@ object Application extends Loggable {
val envParam = readParamFile[EnvConfig](envParamFile) match {
case Success(p) => p
case Failure(ex) =>
-error(ex.getMessage)
+error(ex.getMessage, ex)
sys.exit(-2)
}
val dqParam = readParamFile[DQConfig](dqParamFile) match {
case Success(p) => p
case Failure(ex) =>
-error(ex.getMessage)
+error(ex.getMessage, ex)
sys.exit(-2)
}
val allParam: GriffinConfig = GriffinConfig(envParam, dqParam)
@@ -79,17 +79,19 @@ object Application extends Loggable {
case Success(_) =>
info("process init success")
case Failure(ex) =>
-error(s"process init error: ${ex.getMessage}")
+error(s"process init error: ${ex.getMessage}", ex)
shutdown
sys.exit(-5)
}
// dq app run
-dqApp.run match {
- case Success(_) =>
-info("process run success")
+val success = dqApp.run match {
+ case Success(result) =>
+info("process run result: " + (if (result) "success" else "failed"))
+result
+
case Failure(ex) =>
-error(s"process run error: ${ex.getMessage}")
+error(s"process run error: ${ex.getMessage}", ex)
if (dqApp.retryable) {
throw ex
@@ -104,12 +106,16 @@ object Application extends Loggable {
case Success(_) =>
info("process end success")
case Failure(ex) =>
-error(s"process end error: ${ex.getMessage}")
+error(s"process end error: ${ex.getMessage}", ex)
shutdown
sys.exit(-5)
}
shutdown
+
+if (!success) {
+ sys.exit(-5)
+}
}
private def readParamFile[T <: Param](file: String)(implicit m :
ClassTag[T]): Try[T] = {
incubator-griffin git commit: [GRIFFIN-203] Plaintext mode" for measure creation
Repository: incubator-griffin
Updated Branches:
refs/heads/master e4d587d95 -> bcfd0e269
[GRIFFIN-203] Plaintext mode" for measure creation
Created json/yaml measure creation flow:
Added ability to view measure as yaml:
I did not add any input validation, for now only server side validation is
working. I'm not quite sure if copying validation from service side is a good
choice.
Author: Arthur Gavlyukovskiy
Closes #446 from gavlyukovskiy/raw-measures.
Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/bcfd0e26
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/bcfd0e26
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/bcfd0e26
Branch: refs/heads/master
Commit: bcfd0e2693d743cde61f50621e11cc351197
Parents: e4d587d
Author: Arthur Gavlyukovskiy
Authored: Sun Oct 28 18:55:44 2018 -0700
Committer: Yuepeng
Committed: Sun Oct 28 18:55:44 2018 -0700
--
ui/angular/package.json | 2 +
ui/angular/src/app/app.module.ts| 8 +-
.../create-measure.component.html | 34 ++-
.../create-measure/raw/raw.component.css| 238 +++
.../create-measure/raw/raw.component.html | 102
.../create-measure/raw/raw.component.spec.ts| 43
.../measure/create-measure/raw/raw.component.ts | 146
.../measure-detail/measure-detail.component.css | 4 +
.../measure-detail.component.html | 22 +-
.../measure-detail/measure-detail.component.ts | 12 +-
.../src/app/service/measure-format.service.ts | 48
11 files changed, 649 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/bcfd0e26/ui/angular/package.json
--
diff --git a/ui/angular/package.json b/ui/angular/package.json
index 6926014..91b5d16 100644
--- a/ui/angular/package.json
+++ b/ui/angular/package.json
@@ -30,6 +30,7 @@
"core-js": "^2.4.1",
"echarts": "^3.7.0",
"font-awesome": "^4.7.0",
+"js-yaml": "^3.11.2",
"ng2-bootstrap": "1.6.3",
"ng2-nouislider": "^1.7.6",
"ngx-echarts": "2.3.1",
@@ -45,6 +46,7 @@
"@types/jasminewd2": "~2.0.2",
"@types/jquery": "^3.2.12",
"@types/node": "~6.0.60",
+"@types/js-yaml": "~3.11.2",
"angular-tree-component": "^4.1.0",
"codelyzer": "~3.1.1",
"font-awesome": "^4.7.0",
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/bcfd0e26/ui/angular/src/app/app.module.ts
--
diff --git a/ui/angular/src/app/app.module.ts b/ui/angular/src/app/app.module.ts
index 196fdbc..1598841 100644
--- a/ui/angular/src/app/app.module.ts
+++ b/ui/angular/src/app/app.module.ts
@@ -59,6 +59,7 @@ import {LoaderService} from './loader/loader.service';
import {LoaderComponent} from './loader/loader.component';
import {JobDetailComponent} from './job/job-detail/job-detail.component';
import {StreamingComponent} from
'./job/create-job/streaming/streaming.component';
+import {RawComponent} from "./measure/create-measure/raw/raw.component";
const appRoutes: Routes = [
@@ -113,6 +114,10 @@ const appRoutes: Routes = [
component: PubComponent
},
{
+path: 'createmeasureraw',
+component: RawComponent
+ },
+ {
path: 'detailed/:name',
component: DetailMetricComponent
},
@@ -168,7 +173,8 @@ const appRoutes: Routes = [
ConfigurationComponent,
LoaderComponent,
JobDetailComponent,
-StreamingComponent
+StreamingComponent,
+RawComponent
],
imports: [
BrowserModule,
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/bcfd0e26/ui/angular/src/app/measure/create-measure/create-measure.component.html
--
diff --git
a/ui/angular/src/app/measure/create-measure/create-measure.component.html
b/ui/angular/src/app/measure/create-measure/create-measure.component.html
index 22ff6b6..5aaabc3 100644
--- a/ui/angular/src/app/measure/create-measure/create-measure.component.html
+++ b/ui/angular/src/app/measure/create-measure/create-measure.component.html
@@ -180,7 +180,39 @@ under the License.
-Example: any data ...
+Example: any data ...
+
+
+
+
+
+
+JSON/YAML measure
+
+
+
+
incubator-griffin git commit: Document compression, SSL and LDAP conf
Repository: incubator-griffin
Updated Branches:
refs/heads/master 4370fd86e -> e4d587d95
Document compression, SSL and LDAP conf
Author: Nikolay Sokolov
Closes #450 from chemikadze/patch-2.
Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/e4d587d9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/e4d587d9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/e4d587d9
Branch: refs/heads/master
Commit: e4d587d95a7ead178b41ffe8e4fd9a60967a7f4a
Parents: 4370fd8
Author: Nikolay Sokolov
Authored: Sun Oct 28 18:21:52 2018 -0700
Committer: Yuepeng
Committed: Sun Oct 28 18:21:52 2018 -0700
--
griffin-doc/deploy/deploy-guide.md | 31 +--
1 file changed, 29 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/e4d587d9/griffin-doc/deploy/deploy-guide.md
--
diff --git a/griffin-doc/deploy/deploy-guide.md
b/griffin-doc/deploy/deploy-guide.md
index b60b36e..2c6d80f 100644
--- a/griffin-doc/deploy/deploy-guide.md
+++ b/griffin-doc/deploy/deploy-guide.md
@@ -176,7 +176,35 @@ You should also modify some configurations of Apache
Griffin for your environmen
directory (hdfs:///griffin/persist by default), and Elasticsearch URL
(http://es:9200/griffin/accuracy by default).
Similar changes are required in `env_streaming.json`.
-
+ Compression
+
+Griffin Service is regular Spring Boot application, so it supports all
customizations from Spring Boot.
+To enable output compression, the following should be added to
`application.properties`:
+```
+server.compression.enabled=true
+server.compression.mime-types=application/json,application/xml,text/html,text/xml,text/plain,application/javascript,text/css
+```
+
+ SSL
+
+It is possible to enable SSL encryption for api and web endpoints. To do that,
you will need to prepare keystore in Spring-compatible format (for example,
PKCS12), and add the following values to `application.properties`:
+```
+server.ssl.key-store=/path/to/keystore.p12
+server.ssl.key-store-password=yourpassword
+server.ssl.keyStoreType=PKCS12
+server.ssl.keyAlias=your_key_alias
+```
+
+ LDAP
+
+The following properties are available for LDAP:
+ - **ldap.url**: URL of LDAP server.
+ - **ldap.email**: Arbitrary suffix added to user's login before search, can
be empty string. Used when user's DN contains some common suffix, and there is
no bindDN specified. In this case, string after concatenation is used as DN for
sending initial bind request.
+ - **ldap.searchBase**: Subtree DN to search.
+ - **ldap.searchPattern**: Filter expression, substring `{0}` is replaced with
user's login after ldap.email is concatenated. This expression is used to find
user object in LDAP. Access is denied if filter expression did not match any
users.
+ - **ldap.sslSkipVerify**: Allows to disable certificate validation for secure
LDAP servers.
+ - **ldap.bindDN**: Optional DN of service account used for user lookup.
Useful if user's DN is different than attribute used as user's login, or if
users' DNs are ambiguous.
+ - **ldap.bindPassword**: Optional password of bind service account.
### Build and Run
@@ -208,4 +236,3 @@ After a few seconds, we can visit our default UI of Apache
Griffin (by default t
You can use UI following the steps [here](../ui/user-guide.md).
**Note**: The UI does not support all the backend features, to experience the
advanced features you can use services directly.
-
incubator-griffin git commit: [GRIFFIN-194] single call to fetch all tables of all dbs
Repository: incubator-griffin
Updated Branches:
refs/heads/master 2637ca885 -> 4370fd86e
[GRIFFIN-194] single call to fetch all tables of all dbs
Significantly improves opening speed for measure dialogs.
Previously taking 10+ seconds on huge schemas, with this call
it takes fraction of second to load.
Author: Nikolay Sokolov
Closes #447 from chemikadze/GRIFFIN-194.
Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/4370fd86
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/4370fd86
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/4370fd86
Branch: refs/heads/master
Commit: 4370fd86eb7c7433f6f1d3e9c6ed5913d774ea5a
Parents: 2637ca8
Author: Nikolay Sokolov
Authored: Fri Oct 26 02:07:08 2018 -0700
Committer: Yuepeng
Committed: Fri Oct 26 02:07:08 2018 -0700
--
.../metastore/hive/HiveMetaStoreController.java | 5 ++
.../metastore/hive/HiveMetaStoreService.java| 2 +
.../hive/HiveMetaStoreServiceImpl.java | 14 +-
.../measure/create-measure/ac/ac.component.ts | 51 ---
.../create-measure/pr/step1/step1.component.ts | 52
ui/angular/src/app/service/service.service.ts | 1 +
6 files changed, 60 insertions(+), 65 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/4370fd86/service/src/main/java/org/apache/griffin/core/metastore/hive/HiveMetaStoreController.java
--
diff --git
a/service/src/main/java/org/apache/griffin/core/metastore/hive/HiveMetaStoreController.java
b/service/src/main/java/org/apache/griffin/core/metastore/hive/HiveMetaStoreController.java
index 2371044..ba425ec 100644
---
a/service/src/main/java/org/apache/griffin/core/metastore/hive/HiveMetaStoreController.java
+++
b/service/src/main/java/org/apache/griffin/core/metastore/hive/HiveMetaStoreController.java
@@ -57,6 +57,11 @@ public class HiveMetaStoreController {
return hiveMetaStoreService.getAllTable();
}
+@RequestMapping(value = "/dbs/tables/names", method = RequestMethod.GET)
+public Map> getAllTableNames() {
+return hiveMetaStoreService.getAllTableNames();
+}
+
@RequestMapping(value = "/table", method = RequestMethod.GET)
public Table getTable(@RequestParam("db") String dbName,
@RequestParam("table") String tableName) {
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/4370fd86/service/src/main/java/org/apache/griffin/core/metastore/hive/HiveMetaStoreService.java
--
diff --git
a/service/src/main/java/org/apache/griffin/core/metastore/hive/HiveMetaStoreService.java
b/service/src/main/java/org/apache/griffin/core/metastore/hive/HiveMetaStoreService.java
index 4ef7690..609a34e 100644
---
a/service/src/main/java/org/apache/griffin/core/metastore/hive/HiveMetaStoreService.java
+++
b/service/src/main/java/org/apache/griffin/core/metastore/hive/HiveMetaStoreService.java
@@ -30,6 +30,8 @@ public interface HiveMetaStoreService {
Iterable getAllTableNames(String dbName);
+Map> getAllTableNames();
+
List getAllTable(String db);
Map> getAllTable();
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/4370fd86/service/src/main/java/org/apache/griffin/core/metastore/hive/HiveMetaStoreServiceImpl.java
--
diff --git
a/service/src/main/java/org/apache/griffin/core/metastore/hive/HiveMetaStoreServiceImpl.java
b/service/src/main/java/org/apache/griffin/core/metastore/hive/HiveMetaStoreServiceImpl.java
index 72d8c56..48a78a4 100644
---
a/service/src/main/java/org/apache/griffin/core/metastore/hive/HiveMetaStoreServiceImpl.java
+++
b/service/src/main/java/org/apache/griffin/core/metastore/hive/HiveMetaStoreServiceImpl.java
@@ -24,6 +24,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import com.google.common.collect.Lists;
import org.apache.hadoop.hive.metastore.IMetaStoreClient;
import org.apache.hadoop.hive.metastore.api.Table;
import org.slf4j.Logger;
@@ -99,8 +100,17 @@ public class HiveMetaStoreServiceImpl implements
HiveMetaStoreService {
public List getAllTable(String db) {
return getTables(db);
}
-
-
+
+@Override
+@Cacheable(unless = "#result==null || #result.isEmpty()")
+public Map> getAllTableNames() {
+Map> result = new HashMap<>();
+for (String dbName: getAllDatabases()) {
+result.put(dbName, Lists.newArrayList(getAllTableNames(dbName)));
+}
+return result;
+}
+
@Override
@Cacheable(unless = "#result==null")
public Map> g
incubator-griffin git commit: Support "cache" field on rules in service module
Repository: incubator-griffin
Updated Branches:
refs/heads/master 253d44a3c -> 2637ca885
Support "cache" field on rules in service module
Measure module exposes "cache" flag on rules, but it's not possible to store
and schedule such a job in service module.
Author: Nikolay Sokolov
Closes #442 from chemikadze/service-cache.
Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/2637ca88
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/2637ca88
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/2637ca88
Branch: refs/heads/master
Commit: 2637ca88584dcec29591fb3b16f96689a5d49fef
Parents: 253d44a
Author: Nikolay Sokolov
Authored: Thu Oct 25 23:19:12 2018 +0800
Committer: William Guo
Committed: Thu Oct 25 23:19:12 2018 +0800
--
griffin-doc/measure/measure-configuration-guide.md | 1 +
.../org/apache/griffin/core/measure/entity/Rule.java | 11 +++
2 files changed, 12 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/2637ca88/griffin-doc/measure/measure-configuration-guide.md
--
diff --git a/griffin-doc/measure/measure-configuration-guide.md
b/griffin-doc/measure/measure-configuration-guide.md
index 9ea7730..feeaf1a 100644
--- a/griffin-doc/measure/measure-configuration-guide.md
+++ b/griffin-doc/measure/measure-configuration-guide.md
@@ -234,6 +234,7 @@ Above lists DQ job configure parameters.
* source: name of data source to measure timeliness.
* latency: the latency column name in metric, optional.
* threshold: optional, if set as a time string like "1h", the items with
latency more than 1 hour will be record.
+- **cache**: Cache output dataframe. Optional, valid only for "spark-sql" and
"df-ops" mode. Defaults to `false` if not specified.
- **out**: List of output sinks for the job.
+ Metric output.
* type: "metric"
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/2637ca88/service/src/main/java/org/apache/griffin/core/measure/entity/Rule.java
--
diff --git
a/service/src/main/java/org/apache/griffin/core/measure/entity/Rule.java
b/service/src/main/java/org/apache/griffin/core/measure/entity/Rule.java
index 071243a..3792e4d 100644
--- a/service/src/main/java/org/apache/griffin/core/measure/entity/Rule.java
+++ b/service/src/main/java/org/apache/griffin/core/measure/entity/Rule.java
@@ -81,6 +81,9 @@ public class Rule extends AbstractAuditableEntity {
@Column(name = "\"out\"")
private String out;
+@JsonInclude(JsonInclude.Include.NON_NULL)
+private Boolean cache;
+
@JsonProperty("dsl.type")
public String getDslType() {
return dslType;
@@ -159,6 +162,14 @@ public class Rule extends AbstractAuditableEntity {
this.out = out;
}
+public Boolean getCache() {
+return cache;
+}
+
+public void setCache(Boolean cache) {
+this.cache = cache;
+}
+
@PrePersist
@PreUpdate
public void save() throws JsonProcessingException {
incubator-griffin git commit: Update deploy-guide.md
Repository: incubator-griffin Updated Branches: refs/heads/master 0f9afce35 -> 253d44a3c Update deploy-guide.md Update for psql command -p option explaination. Author: RichFy <43976743+ric...@users.noreply.github.com> Closes #445 from RichFy/master. Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/253d44a3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/253d44a3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/253d44a3 Branch: refs/heads/master Commit: 253d44a3c6d1f383535717b9c6dd639c6ca521c2 Parents: 0f9afce Author: RichFy <43976743+ric...@users.noreply.github.com> Authored: Thu Oct 25 22:50:35 2018 +0800 Committer: William Guo Committed: Thu Oct 25 22:50:35 2018 +0800 -- griffin-doc/deploy/deploy-guide.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/253d44a3/griffin-doc/deploy/deploy-guide.md -- diff --git a/griffin-doc/deploy/deploy-guide.md b/griffin-doc/deploy/deploy-guide.md index de5d611..b60b36e 100644 --- a/griffin-doc/deploy/deploy-guide.md +++ b/griffin-doc/deploy/deploy-guide.md @@ -50,7 +50,7 @@ createdb -O quartz ``` Init quartz tables in PostgreSQL using [Init_quartz_postgres.sql](../../service/src/main/resources/Init_quartz_postgres.sql) ``` -psql -p -h -U -f Init_quartz_postgres.sql quartz +psql -p -h -U -f Init_quartz_postgres.sql quartz ``` MySQL
incubator-griffin git commit: Fix conventions in batch-sample
Repository: incubator-griffin
Updated Branches:
refs/heads/master 73a7d84b6 -> 0f9afce35
Fix conventions in batch-sample
Bring conventions for enums in measure-batch-sample in sync with service module.
While measure accepts any case, service requires them capitalized.
Author: Nikolay Sokolov
Closes #443 from chemikadze/patch-1.
Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/0f9afce3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/0f9afce3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/0f9afce3
Branch: refs/heads/master
Commit: 0f9afce35bc7465181fceb68c9173b3f41a342e9
Parents: 73a7d84
Author: Nikolay Sokolov
Authored: Thu Oct 25 22:41:14 2018 +0800
Committer: William Guo
Committed: Thu Oct 25 22:41:14 2018 +0800
--
griffin-doc/measure/measure-batch-sample.md | 18 +-
.../measure/measure-configuration-guide.md| 16
griffin-doc/measure/measure-streaming-sample.md | 16
3 files changed, 25 insertions(+), 25 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/0f9afce3/griffin-doc/measure/measure-batch-sample.md
--
diff --git a/griffin-doc/measure/measure-batch-sample.md
b/griffin-doc/measure/measure-batch-sample.md
index 7867ea5..f45d040 100644
--- a/griffin-doc/measure/measure-batch-sample.md
+++ b/griffin-doc/measure/measure-batch-sample.md
@@ -25,7 +25,7 @@ Apache Griffin measures consist of batch measure and
streaming measure, this doc
{
"name": "accu_batch",
- "process.type": "batch",
+ "process.type": "BATCH",
"data.sources": [
{
@@ -33,7 +33,7 @@ Apache Griffin measures consist of batch measure and
streaming measure, this doc
"baseline": true,
"connectors": [
{
- "type": "avro",
+ "type": "AVRO",
"version": "1.7",
"config": {
"file.name": "src/test/resources/users_info_src.avro"
@@ -44,7 +44,7 @@ Apache Griffin measures consist of batch measure and
streaming measure, this doc
"name": "target",
"connectors": [
{
- "type": "avro",
+ "type": "AVRO",
"version": "1.7",
"config": {
"file.name": "src/test/resources/users_info_target.avro"
@@ -58,7 +58,7 @@ Apache Griffin measures consist of batch measure and
streaming measure, this doc
"rules": [
{
"dsl.type": "griffin-dsl",
-"dq.type": "accuracy",
+"dq.type": "ACCURACY",
"out.dataframe.name": "accu",
"rule": "source.user_id = target.user_id AND upper(source.first_name)
= upper(target.first_name) AND source.last_name = target.last_name AND
source.address = target.address AND source.email = target.email AND
source.phone = target.phone AND source.post_code = target.post_code",
"details": {
@@ -100,14 +100,14 @@ The miss records of source will be persisted as record.
{
"name": "prof_batch",
- "process.type": "batch",
+ "process.type": "BATCH",
"data.sources": [
{
"name": "source",
"connectors": [
{
- "type": "hive",
+ "type": "HIVE",
"version": "1.2",
"config": {
"database": "default",
@@ -122,7 +122,7 @@ The miss records of source will be persisted as record.
"rules": [
{
"dsl.type": "griffin-dsl",
-"dq.type": "profiling",
+"dq.type": "PROFILING",
"out.dataframe.name": "prof",
"rule": "select max(age) as `max_age`, min(age) as `min_age` from
source",
"out": [
@@ -134,7 +134,7 @@ The miss records of source will be persisted as record.
},
{
"dsl.type": "griffin-dsl",
-"dq.type": "profiling",
+"dq.type": "PROFILING",
"out.dataframe.name": "name_grp",
"rule": "select name, count(*) as cnt from source group by name",
"out": [
@@ -158,4 +158,4 @@ In this sample, we use hive table as source.
### Evaluate rule
In this profiling sample, the rule describes the profiling request: `select
max(age) as max_age, min(age) as min_age from source` and `select name,
count(*) as cnt from source group by name`.
-The profiling metrics will be persisted as metric, with the max and min value
of age, and count group by name, like this: `{"max_age": 53, "min_age": 11,
"name_grp": [{"name": "Adam", "cnt": 13}, {"name": "Fred", "cnt": 2}]}`.
\ No newline at end of file
+The profiling metrics will be persisted as metric, with the max and min value
of age, and count group by name, like this: `{"max_age": 53, "min_age": 11,
"name_grp": [{"name": "Adam", "cnt": 13}, {"name": "Fred", "c
incubator-griffin git commit: [GRIFFIN-207] LDAP login service improvements
Repository: incubator-griffin
Updated Branches:
refs/heads/master 3c61e3f1f -> 73a7d84b6
[GRIFFIN-207] LDAP login service improvements
- allow non-CN usernames
- allow disabling certificate checks
- allow limiting set of login users
- improve logging
Author: Nikolay Sokolov
Closes #441 from chemikadze/GRIFFIN-207.
Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/73a7d84b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/73a7d84b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/73a7d84b
Branch: refs/heads/master
Commit: 73a7d84b672fded4b773cfd37c32c0ab01191040
Parents: 3c61e3f
Author: Nikolay Sokolov
Authored: Thu Oct 25 22:20:41 2018 +0800
Committer: William Guo
Committed: Thu Oct 25 22:20:41 2018 +0800
--
.../apache/griffin/core/config/LoginConfig.java | 9 +-
.../core/login/LoginServiceLdapImpl.java| 122 +++
.../login/ldap/SelfSignedSocketFactory.java | 102
3 files changed, 207 insertions(+), 26 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/73a7d84b/service/src/main/java/org/apache/griffin/core/config/LoginConfig.java
--
diff --git
a/service/src/main/java/org/apache/griffin/core/config/LoginConfig.java
b/service/src/main/java/org/apache/griffin/core/config/LoginConfig.java
index ca43751..8c9e4a2 100644
--- a/service/src/main/java/org/apache/griffin/core/config/LoginConfig.java
+++ b/service/src/main/java/org/apache/griffin/core/config/LoginConfig.java
@@ -39,7 +39,12 @@ public class LoginConfig {
private String searchBase;
@Value("${ldap.searchPattern}")
private String searchPattern;
-
+@Value("${ldap.sslSkipVerify:false}")
+private boolean sslSkipVerify;
+@Value("${ldap.bindDN:}")
+private String bindDN;
+@Value("${ldap.bindPassword:}")
+private String bindPassword;
@Bean
public LoginService loginService() {
@@ -48,7 +53,7 @@ public class LoginConfig {
return new LoginServiceDefaultImpl();
case "ldap":
return new LoginServiceLdapImpl(url, email, searchBase,
-searchPattern);
+searchPattern, sslSkipVerify, bindDN, bindPassword);
default:
return null;
}
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/73a7d84b/service/src/main/java/org/apache/griffin/core/login/LoginServiceLdapImpl.java
--
diff --git
a/service/src/main/java/org/apache/griffin/core/login/LoginServiceLdapImpl.java
b/service/src/main/java/org/apache/griffin/core/login/LoginServiceLdapImpl.java
index 9a96cb9..56f6765 100644
---
a/service/src/main/java/org/apache/griffin/core/login/LoginServiceLdapImpl.java
+++
b/service/src/main/java/org/apache/griffin/core/login/LoginServiceLdapImpl.java
@@ -22,15 +22,20 @@ package org.apache.griffin.core.login;
import java.util.HashMap;
import java.util.Hashtable;
import java.util.Map;
+import java.util.NoSuchElementException;
+import javax.naming.AuthenticationException;
import javax.naming.Context;
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
+import javax.naming.directory.Attribute;
import javax.naming.directory.Attributes;
import javax.naming.directory.SearchControls;
import javax.naming.directory.SearchResult;
import javax.naming.ldap.InitialLdapContext;
import javax.naming.ldap.LdapContext;
+import org.apache.commons.lang.StringUtils;
+import org.apache.griffin.core.login.ldap.SelfSignedSocketFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.http.HttpStatus;
@@ -48,13 +53,20 @@ public class LoginServiceLdapImpl implements LoginService {
private String searchBase;
private String searchPattern;
private SearchControls searchControls;
+private boolean sslSkipVerify;
+private String bindDN;
+private String bindPassword;
public LoginServiceLdapImpl(String url, String email, String searchBase,
-String searchPattern) {
+String searchPattern, boolean sslSkipVerify,
+String bindDN, String bindPassword) {
this.url = url;
this.email = email;
this.searchBase = searchBase;
this.searchPattern = searchPattern;
+this.sslSkipVerify = sslSkipVerify;
+this.bindDN = bindDN;
+this.bindPassword = bindPassword;
SearchControls searchControls = new SearchControls();
searchControls.setSearchScope(SearchControls.SUBTREE_SCOPE);
incubator-griffin git commit: Update recommended ES index schema
Repository: incubator-griffin
Updated Branches:
refs/heads/master 1456e86cc -> 3c61e3f1f
Update recommended ES index schema
Author: Nikolay Sokolov
Closes #440 from chemikadze/patch-1.
Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/3c61e3f1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/3c61e3f1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/3c61e3f1
Branch: refs/heads/master
Commit: 3c61e3f1fcdf47816e6cb56199102d419d5032bc
Parents: 1456e86
Author: Nikolay Sokolov
Authored: Mon Oct 22 17:04:00 2018 +0800
Committer: William Guo
Committed: Mon Oct 22 17:04:00 2018 +0800
--
griffin-doc/deploy/deploy-guide.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/3c61e3f1/griffin-doc/deploy/deploy-guide.md
--
diff --git a/griffin-doc/deploy/deploy-guide.md
b/griffin-doc/deploy/deploy-guide.md
index 58bff6b..de5d611 100644
--- a/griffin-doc/deploy/deploy-guide.md
+++ b/griffin-doc/deploy/deploy-guide.md
@@ -84,14 +84,14 @@ curl -XPUT http://es:9200/griffin -d '
"type": "text"
},
"tmst": {
-"type": "long"
+"type": "date"
}
}
}
},
"settings": {
"index": {
-"number_of_replicas": "1",
+"number_of_replicas": "2",
"number_of_shards": "5"
}
}
incubator-griffin git commit: Complement stuffs to docker guide.
Repository: incubator-griffin
Updated Branches:
refs/heads/master 3545a71c7 -> 1456e86cc
Complement stuffs to docker guide.
Author: Eugene
Closes #439 from toyboxman/doc/docker.
Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/1456e86c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/1456e86c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/1456e86c
Branch: refs/heads/master
Commit: 1456e86cc70ba27a608cfa6e02420d71cfc0c5e6
Parents: 3545a71
Author: Eugene
Authored: Tue Oct 16 15:07:46 2018 +0800
Committer: William Guo
Committed: Tue Oct 16 15:07:46 2018 +0800
--
griffin-doc/docker/griffin-docker-guide.md | 37 +++--
1 file changed, 35 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/1456e86c/griffin-doc/docker/griffin-docker-guide.md
--
diff --git a/griffin-doc/docker/griffin-docker-guide.md
b/griffin-doc/docker/griffin-docker-guide.md
index 750a654..7395740 100644
--- a/griffin-doc/docker/griffin-docker-guide.md
+++ b/griffin-doc/docker/griffin-docker-guide.md
@@ -78,8 +78,41 @@ And change the initial environment `BASE_PATH` value to
`
6. Add a job to through api `jobs -> Add job`, to schedule a job to execute
the measure. In the example, the schedule interval is 5 minutes.
7. After some minutes, you can get the metrics from elasticsearch.
-```
-curl -XGET ':39200/griffin/accuracy/_search?pretty&filter_path=hits.hits._source'
-d '{"query":{"match_all":{}}, "sort": [{"tmst": {"order": "asc"}}]}'
+```bash
+curl -XGET ':39200/griffin/accuracy/_search?pretty&filter_path=hits.hits._source' \
+-d '{"query":{"match_all":{}}, "sort": [{"tmst": {"order": "asc"}}]}'
+
+# json metric data returned
+{
+ "hits" : {
+"hits" : [
+ {
+"_source" : {
+ "name" : "metricName",
+ "tmst" : 1509599811123,
+ "value" : {
+"__tmst" : 1509599811123,
+"miss" : 11,
+"total" : 125000,
+"matched" : 124989
+ }
+}
+ },
+ {
+"_source" : {
+ "name" : "metricName",
+ "tmst" : 1509599811123,
+ "value" : {
+"__tmst" : 1509599811123,
+"miss" : 11,
+"total" : 125000,
+"matched" : 124989
+ }
+}
+ }
+]
+ }
+}
```
### How to use Apache Griffin docker images in streaming mode
incubator-griffin git commit: update measure documents
Repository: incubator-griffin
Updated Branches:
refs/heads/master 1b2b3e352 -> 3545a71c7
update measure documents
Author: Lionel Liu
Closes #438 from bhlx3lyx7/doc-update.
Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/3545a71c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/3545a71c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/3545a71c
Branch: refs/heads/master
Commit: 3545a71c7c63623869f20aa414eb617fcb0786c0
Parents: 1b2b3e3
Author: Lionel Liu
Authored: Tue Oct 16 14:19:44 2018 +0800
Committer: William Guo
Committed: Tue Oct 16 14:19:44 2018 +0800
--
griffin-doc/measure/dsl-guide.md| 6 +-
griffin-doc/measure/measure-batch-sample.md | 14 +++--
.../measure/measure-configuration-guide.md | 55 --
griffin-doc/measure/measure-streaming-sample.md | 59 ++--
.../configuration/dqdefinition/DQConfig.scala | 3 -
5 files changed, 66 insertions(+), 71 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/3545a71c/griffin-doc/measure/dsl-guide.md
--
diff --git a/griffin-doc/measure/dsl-guide.md b/griffin-doc/measure/dsl-guide.md
index 4eb294e..5296176 100644
--- a/griffin-doc/measure/dsl-guide.md
+++ b/griffin-doc/measure/dsl-guide.md
@@ -24,14 +24,14 @@ Griffin DSL is designed for DQ measurement, as a SQL-like
language, which descri
Griffin DSL syntax is easy to learn as it's SQL-like, case insensitive.
### Supporting process
-- logical operation: `not, and, or, in, between, like, is null, is nan, =, !=,
<>, <=, >=, <, >`
+- logical operation: `not, and, or, in, between, like, rlike, is null, is nan,
=, !=, <>, <=, >=, <, >`
- mathematical operation: `+, -, *, /, %`
- sql statement: `as, where, group by, having, order by, limit`
### Keywords
- `null, nan, true, false`
- `not, and, or`
-- `in, between, like, is`
+- `in, between, like, rlike, is`
- `select, distinct, from, as, where, group, by, having, order, desc, asc,
limit`
### Operators
@@ -79,6 +79,8 @@ Griffin DSL syntax is easy to learn as it's SQL-like, case
insensitive.
e.g. `source.age between 3 and 30`, `source.age between (3, 30)`
- **like**: like clause like sql.
e.g. `source.name like "%abc%"`
+- **rlike**: rlike clause like spark sql.
+e.g. `source.name rlike "^abc.*$"`
- **is null**: is null operator like sql.
e.g. `source.desc is not null`
- **is nan**: check if the value is not a number, the syntax like `is null`
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/3545a71c/griffin-doc/measure/measure-batch-sample.md
--
diff --git a/griffin-doc/measure/measure-batch-sample.md
b/griffin-doc/measure/measure-batch-sample.md
index 1a9bc41..7867ea5 100644
--- a/griffin-doc/measure/measure-batch-sample.md
+++ b/griffin-doc/measure/measure-batch-sample.md
@@ -59,7 +59,7 @@ Apache Griffin measures consist of batch measure and
streaming measure, this doc
{
"dsl.type": "griffin-dsl",
"dq.type": "accuracy",
-"name": "accu",
+"out.dataframe.name": "accu",
"rule": "source.user_id = target.user_id AND upper(source.first_name)
= upper(target.first_name) AND source.last_name = target.last_name AND
source.address = target.address AND source.email = target.email AND
source.phone = target.phone AND source.post_code = target.post_code",
"details": {
"source": "source",
@@ -80,7 +80,9 @@ Apache Griffin measures consist of batch measure and
streaming measure, this doc
]
}
]
- }
+ },
+
+ "sinks": ["CONSOLE", "ELASTICSEARCH"]
}
```
Above is the configure file of batch accuracy job.
@@ -121,7 +123,7 @@ The miss records of source will be persisted as record.
{
"dsl.type": "griffin-dsl",
"dq.type": "profiling",
-"name": "prof",
+"out.dataframe.name": "prof",
"rule": "select max(age) as `max_age`, min(age) as `min_age` from
source",
"out": [
{
@@ -133,7 +135,7 @@ The miss records of source will be persisted as record.
{
"dsl.type": "griffin-dsl",
"dq.type": "profiling",
-"name": "name_grp",
+"out.dataframe.name": "name_grp",
"rule": "select name, count(*) as cnt from source group by name",
"out": [
{
@@ -144,7 +146,9 @@ The miss records of source will be persisted as record.
]
}
]
- }
+ },
+
+ "sinks": ["CONSOLE", "ELASTICSEARCH"]
}
```
Above is the configure file of batch profiling job.
http://git-wip-us.apache.org/repos
incubator-griffin git commit: [GRIFFIN-202] Show raw rules on UI
Repository: incubator-griffin
Updated Branches:
refs/heads/master cbde1e4fc -> 1b2b3e352
[GRIFFIN-202] Show raw rules on UI
[GRIFFIN-202] Creates section on Measure Detail page, showing formatted JSON of
the rule.
Author: Nikolay Sokolov
Closes #437 from chemikadze/GRIFFIN-202.
Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/1b2b3e35
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/1b2b3e35
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/1b2b3e35
Branch: refs/heads/master
Commit: 1b2b3e35235644d01a78f75c48ad5bd80e797c41
Parents: cbde1e4
Author: Nikolay Sokolov
Authored: Mon Oct 15 17:06:31 2018 +0800
Committer: William Guo
Committed: Mon Oct 15 17:06:31 2018 +0800
--
.gitignore | 2 ++
ui/angular/.angular-cli.json | 3 ++-
.../measure-detail/measure-detail.component.css | 14 +-
.../measure-detail/measure-detail.component.html | 6 ++
.../measure-detail/measure-detail.component.ts | 19 +++
ui/angular/src/app/service/service.service.ts| 5 ++---
ui/angular/src/environments/environment.prod.ts | 3 ++-
ui/angular/src/environments/environment.ts | 3 ++-
8 files changed, 44 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/1b2b3e35/.gitignore
--
diff --git a/.gitignore b/.gitignore
index b43a694..a09422a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,3 +40,5 @@ metastore_db
measure/src/test/test_scala/*
.vscode
+
+environment.local.ts
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/1b2b3e35/ui/angular/.angular-cli.json
--
diff --git a/ui/angular/.angular-cli.json b/ui/angular/.angular-cli.json
index 2044168..08a2e3a 100644
--- a/ui/angular/.angular-cli.json
+++ b/ui/angular/.angular-cli.json
@@ -30,7 +30,8 @@
"environmentSource": "environments/environment.ts",
"environments": {
"dev": "environments/environment.ts",
-"prod": "environments/environment.prod.ts"
+"prod": "environments/environment.prod.ts",
+"local": "environments/environment.local.ts"
}
}
],
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/1b2b3e35/ui/angular/src/app/measure/measure-detail/measure-detail.component.css
--
diff --git
a/ui/angular/src/app/measure/measure-detail/measure-detail.component.css
b/ui/angular/src/app/measure/measure-detail/measure-detail.component.css
index 214f8c6..9e8c026 100644
--- a/ui/angular/src/app/measure/measure-detail/measure-detail.component.css
+++ b/ui/angular/src/app/measure/measure-detail/measure-detail.component.css
@@ -15,4 +15,16 @@ software distributed under the License is distributed on an
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-*/
\ No newline at end of file
+*/
+
+.code-viewport {
+ background-color: #33;
+ border: 1px solid #1d1d1d;
+ border-radius: 4px;
+ font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
+ font-size: 13px;
+ line-height: 1.5;
+ color: #e4e4e4;
+ word-break: break-all;
+ word-wrap: break-word;
+}
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/1b2b3e35/ui/angular/src/app/measure/measure-detail/measure-detail.component.html
--
diff --git
a/ui/angular/src/app/measure/measure-detail/measure-detail.component.html
b/ui/angular/src/app/measure/measure-detail/measure-detail.component.html
index dcf78fa..02871de 100644
--- a/ui/angular/src/app/measure/measure-detail/measure-detail.component.html
+++ b/ui/angular/src/app/measure/measure-detail/measure-detail.component.html
@@ -190,5 +190,11 @@ under the License.
{{index.name}} : {{index.infos}}
+Rules JSON
+
+ Show full JSON
+ Show rules
only
+ {{ getJsonContent() }}
+
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/1b2b3e35/ui/angular/src/app/measure/measure-detail/measure-detail.component.ts
--
diff --git
a/ui/angular/src/app/measure/measure-detail/measure-detail.component.ts
b/ui/angular/src/app/measure/measure-detail/measure-detail.component.ts
index 8e10f0e..a30f4fb 100644
--- a/ui/angular/src/app/measure/measu
incubator-griffin git commit: always use apache griffin together as our mark
Repository: incubator-griffin Updated Branches: refs/heads/master 05680f01a -> cbde1e4fc always use apache griffin together as our mark Author: William Guo Closes #436 from guoyuepeng/use_apache_griffin_as_trademark. Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/cbde1e4f Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/cbde1e4f Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/cbde1e4f Branch: refs/heads/master Commit: cbde1e4fcc0b77b7655a493203d3f0d0896ae924 Parents: 05680f0 Author: William Guo Authored: Mon Oct 15 13:53:08 2018 +0800 Committer: William Guo Committed: Mon Oct 15 13:53:08 2018 +0800 -- griffin-doc/deploy/deploy-guide.md | 12 griffin-doc/dev/code-style.md | 6 ++-- griffin-doc/dev/dev-env-build.md| 14 - griffin-doc/docker/griffin-docker-guide.md | 24 +++ griffin-doc/measure/dsl-guide.md| 32 ++-- .../measure/measure-configuration-guide.md | 2 +- griffin-doc/measure/measure-streaming-sample.md | 8 ++--- griffin-doc/roadmap.md | 8 ++--- griffin-doc/service/api-guide.md| 22 +++--- .../service/hibernate_eclipselink_switch.md | 10 +++--- griffin-doc/service/mysql_postgresql_switch.md | 2 +- griffin-doc/ui/user-guide.md| 2 +- 12 files changed, 71 insertions(+), 71 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/cbde1e4f/griffin-doc/deploy/deploy-guide.md -- diff --git a/griffin-doc/deploy/deploy-guide.md b/griffin-doc/deploy/deploy-guide.md index b2f3536..58bff6b 100644 --- a/griffin-doc/deploy/deploy-guide.md +++ b/griffin-doc/deploy/deploy-guide.md @@ -18,7 +18,7 @@ under the License. --> # Apache Griffin Deployment Guide -For Griffin users, please follow the instructions below to deploy Griffin in your environment. Note that there are some dependencies that should be installed firstly. +For Apache Griffin users, please follow the instructions below to deploy Apache Griffin in your environment. Note that there are some dependencies that should be installed firstly. ### Prerequisites You need to install following items @@ -30,7 +30,7 @@ You need to install following items - [Hive](http://apache.claz.org/hive/hive-2.2.0/apache-hive-2.2.0-bin.tar.gz) (version 2.2.0), you can get some help [here](https://cwiki.apache.org/confluence/display/Hive/GettingStarted#GettingStarted-RunningHive). You need to make sure that your spark cluster could access your HiveContext. - [Livy](http://archive.cloudera.com/beta/livy/livy-server-0.3.0.zip), you can get some help [here](http://livy.io/quickstart.html). -Griffin need to schedule spark jobs by server, we use livy to submit our jobs. +Apache Griffin need to schedule spark jobs by server, we use livy to submit our jobs. For some issues of Livy for HiveContext, we need to download 3 files or get them from Spark lib `$SPARK_HOME/lib/`, and put them into HDFS. ``` datanucleus-api-jdo-3.2.6.jar @@ -38,7 +38,7 @@ You need to install following items datanucleus-rdbms-3.2.9.jar ``` - ElasticSearch (5.0 or later versions). - ElasticSearch works as a metrics collector, Griffin produces metrics into it, and our default UI gets metrics from it, you can use them by your own way as well. + ElasticSearch works as a metrics collector, Apache Griffin produces metrics into it, and our default UI gets metrics from it, you can use them by your own way as well. ### Configuration @@ -99,12 +99,12 @@ curl -XPUT http://es:9200/griffin -d ' ' ``` -You should also modify some configurations of Griffin for your environment. +You should also modify some configurations of Apache Griffin for your environment. - service/src/main/resources/application.properties ``` -# griffin server port (default 8080) +# Apache Griffin server port (default 8080) server.port = 8080 # jpa spring.datasource.url = jdbc:postgresql://:5432/quartz?autoReconnect=true&useSSL=false @@ -199,7 +199,7 @@ After all environment services startup, we can start our server. java -jar service/target/service.jar ``` -After a few seconds, we can visit our default UI of Griffin (by default the port of spring boot is 8080). +After a few seconds, we can visit our default UI of Apache Griffin (by default the port of spring boot is 8080). ``` http://:8080 http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/cbde1e4f/griffin-doc/dev/code-style.md -
incubator-griffin git commit: [GRIFFIN-206] fix job timezone when creating from UI
Repository: incubator-griffin
Updated Branches:
refs/heads/master d99155749 -> 05680f01a
[GRIFFIN-206] fix job timezone when creating from UI
Demonstration of the problem:
```
> new Date()
Wed Oct 10 2018 11:30:48 GMT-0700 (Pacific Daylight Time)
> new Date().getTimezoneOffset()/60
7
```
Author: Nikolay Sokolov
Closes #435 from chemikadze/GRIFFIN-206.
Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/05680f01
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/05680f01
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/05680f01
Branch: refs/heads/master
Commit: 05680f01a9e16d2db5fbe541757dc8ca19353fce
Parents: d991557
Author: Nikolay Sokolov
Authored: Mon Oct 15 11:13:38 2018 +0800
Committer: William Guo
Committed: Mon Oct 15 11:13:38 2018 +0800
--
.../apache/griffin/core/job/JobInstance.java| 9 +--
.../org/apache/griffin/core/util/TimeUtil.java | 8 ++
.../apache/griffin/core/util/TimeUtilTest.java | 36 +
.../job/create-job/batch/batch.component.html | 9 ++-
.../app/job/create-job/batch/batch.component.ts | 9 ++-
.../create-job/streaming/streaming.component.ts | 5 +-
.../configuration/configuration.component.html | 2 +-
.../configuration/configuration.component.ts| 82 ++--
ui/angular/src/app/shared/shared.module.ts | 30 +++
ui/angular/src/app/shared/time-utils.ts | 26 +++
ui/angular/src/styles.css | 14
11 files changed, 171 insertions(+), 59 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/05680f01/service/src/main/java/org/apache/griffin/core/job/JobInstance.java
--
diff --git a/service/src/main/java/org/apache/griffin/core/job/JobInstance.java
b/service/src/main/java/org/apache/griffin/core/job/JobInstance.java
index afb25d8..47b42f3 100644
--- a/service/src/main/java/org/apache/griffin/core/job/JobInstance.java
+++ b/service/src/main/java/org/apache/griffin/core/job/JobInstance.java
@@ -257,7 +257,7 @@ public class JobInstance implements Job {
}
for (Long timestamp : sampleTs) {
set.add(TimeUtil.format(value, timestamp,
-getTimeZone(timezone)));
+TimeUtil.getTimeZone(timezone)));
}
conf.put(entry.getKey(), StringUtils.join(set,
PATH_CONNECTOR_CHARACTER));
@@ -265,13 +265,6 @@ public class JobInstance implements Job {
}
}
-private TimeZone getTimeZone(String timezone) {
-if (StringUtils.isEmpty(timezone)) {
-return TimeZone.getDefault();
-}
-return TimeZone.getTimeZone(timezone);
-}
-
@SuppressWarnings("unchecked")
private void createJobInstance(Map confMap)
throws Exception {
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/05680f01/service/src/main/java/org/apache/griffin/core/util/TimeUtil.java
--
diff --git a/service/src/main/java/org/apache/griffin/core/util/TimeUtil.java
b/service/src/main/java/org/apache/griffin/core/util/TimeUtil.java
index b233c54..17e08d6 100644
--- a/service/src/main/java/org/apache/griffin/core/util/TimeUtil.java
+++ b/service/src/main/java/org/apache/griffin/core/util/TimeUtil.java
@@ -28,6 +28,7 @@ import java.util.concurrent.TimeUnit;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -148,4 +149,11 @@ public class TimeUtil {
return str.replaceAll(escapeHashTagPattern, hashTag);
}
+public static TimeZone getTimeZone(String timezone) {
+if (StringUtils.isEmpty(timezone)) {
+return TimeZone.getDefault();
+}
+return TimeZone.getTimeZone(timezone);
+}
+
}
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/05680f01/service/src/test/java/org/apache/griffin/core/util/TimeUtilTest.java
--
diff --git
a/service/src/test/java/org/apache/griffin/core/util/TimeUtilTest.java
b/service/src/test/java/org/apache/griffin/core/util/TimeUtilTest.java
index aefe76d..f2e89ae 100644
--- a/service/src/test/java/org/apache/griffin/core/util/TimeUtilTest.java
+++ b/service/src/test/java/org/apache/griffin/core/util/TimeUtilTest.java
@@ -21,6 +21,8 @@ package org.apache.griffin.core.util;
import static org.junit.Assert.assertEquals;
+import java.util.HashMap;
+import java.util.Map;
import java.util.TimeZone;
import org.junit.Te
incubator-griffin git commit: Fix a little doc bug concerning measure part.
Repository: incubator-griffin Updated Branches: refs/heads/master 791c502da -> d99155749 Fix a little doc bug concerning measure part. fix linguistic error and improve content Author: Eugene Closes #432 from toyboxman/doc/measure. Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/d9915574 Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/d9915574 Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/d9915574 Branch: refs/heads/master Commit: d9915574935ce1fe3c2bfe7c661d943f70f94607 Parents: 791c502 Author: Eugene Authored: Mon Oct 15 11:08:32 2018 +0800 Committer: William Guo Committed: Mon Oct 15 11:08:32 2018 +0800 -- griffin-doc/measure/measure-batch-sample.md| 2 +- griffin-doc/measure/measure-configuration-guide.md | 2 +- griffin-doc/measure/measure-streaming-sample.md| 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/d9915574/griffin-doc/measure/measure-batch-sample.md -- diff --git a/griffin-doc/measure/measure-batch-sample.md b/griffin-doc/measure/measure-batch-sample.md index c504afa..1a9bc41 100644 --- a/griffin-doc/measure/measure-batch-sample.md +++ b/griffin-doc/measure/measure-batch-sample.md @@ -18,7 +18,7 @@ under the License. --> # Measure Batch Sample -Measures consists of batch measure and streaming measure. This document is for the batch measure sample. +Apache Griffin measures consist of batch measure and streaming measure, this document merely gives the batch measure sample. ## Batch Accuracy Sample ``` http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/d9915574/griffin-doc/measure/measure-configuration-guide.md -- diff --git a/griffin-doc/measure/measure-configuration-guide.md b/griffin-doc/measure/measure-configuration-guide.md index be29e36..4f00803 100644 --- a/griffin-doc/measure/measure-configuration-guide.md +++ b/griffin-doc/measure/measure-configuration-guide.md @@ -18,7 +18,7 @@ under the License. --> # Griffin Measure Configuration Guide -Griffin measure module needs two configuration files to define the parameters of execution, one is for environment, the other is for dq job. +Apache Griffin measure module needs two configuration files to define the parameters of execution, one is for environment, the other is for dq job. ## Environment Parameters ``` http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/d9915574/griffin-doc/measure/measure-streaming-sample.md -- diff --git a/griffin-doc/measure/measure-streaming-sample.md b/griffin-doc/measure/measure-streaming-sample.md index 49093bf..846d870 100644 --- a/griffin-doc/measure/measure-streaming-sample.md +++ b/griffin-doc/measure/measure-streaming-sample.md @@ -18,7 +18,7 @@ under the License. --> # Measure Streaming Sample -Measures consists of batch measure and streaming measure. This document is for the streaming measure sample. +Apache Griffin measures consist of batch measure and streaming measure, this document merely gives the streaming measure sample. ## Streaming Accuracy Sample ```
incubator-griffin git commit: [GRIFFIN-205] accuracy matched fraction
Repository: incubator-griffin
Updated Branches:
refs/heads/master cc35024a6 -> 791c502da
[GRIFFIN-205] accuracy matched fraction
https://issues.apache.org/jira/browse/GRIFFIN-205
This pull request covers only batch dq type.
We need to decide is it worth to add "matched fraction" to streaming type.
Accuracy transformation tests added.
Author: ashutak
Closes #434 from ashutakGG/GRIFFIN-205-accuracy-matchedFraction.
Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/791c502d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/791c502d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/791c502d
Branch: refs/heads/master
Commit: 791c502dab1d30e3758bd85a35dff545b4ab74aa
Parents: cc35024
Author: ashutak
Authored: Sat Oct 13 18:30:48 2018 +0800
Committer: William Guo
Committed: Sat Oct 13 18:30:48 2018 +0800
--
.../configuration/dqdefinition/DQConfig.scala | 16 +-
.../dsl/transform/AccuracyExpr2DQSteps.scala| 17 +-
.../src/test/resources/hive/person_table.csv| 2 +
...AccuracyTransformationsIntegrationTest.scala | 180 +++
4 files changed, 202 insertions(+), 13 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/791c502d/measure/src/main/scala/org/apache/griffin/measure/configuration/dqdefinition/DQConfig.scala
--
diff --git
a/measure/src/main/scala/org/apache/griffin/measure/configuration/dqdefinition/DQConfig.scala
b/measure/src/main/scala/org/apache/griffin/measure/configuration/dqdefinition/DQConfig.scala
index b281481..a4cdfc1 100644
---
a/measure/src/main/scala/org/apache/griffin/measure/configuration/dqdefinition/DQConfig.scala
+++
b/measure/src/main/scala/org/apache/griffin/measure/configuration/dqdefinition/DQConfig.scala
@@ -74,9 +74,9 @@ case class DQConfig(@JsonProperty("name") private val name:
String,
*/
@JsonInclude(Include.NON_NULL)
case class DataSourceParam( @JsonProperty("name") private val name: String,
-@JsonProperty("baseline") private val baseline:
Boolean,
@JsonProperty("connectors") private val
connectors: List[DataConnectorParam],
-@JsonProperty("checkpoint") private val
checkpoint: Map[String, Any]
+@JsonProperty("baseline") private val baseline:
Boolean = false,
+@JsonProperty("checkpoint") private val
checkpoint: Map[String, Any] = null
) extends Param {
def getName: String = name
def isBaseline: Boolean = if (!baseline.equals(null)) baseline else false
@@ -148,12 +148,12 @@ case class EvaluateRuleParam( @JsonProperty("rules")
private val rules: List[Rul
@JsonInclude(Include.NON_NULL)
case class RuleParam(@JsonProperty("dsl.type") private val dslType: String,
@JsonProperty("dq.type") private val dqType: String,
- @JsonProperty("in.dataframe.name") private val inDfName:
String,
- @JsonProperty("out.dataframe.name") private val
outDfName: String,
- @JsonProperty("rule") private val rule: String,
- @JsonProperty("details") private val details: Map[String,
Any],
- @JsonProperty("cache") private val cache: Boolean,
- @JsonProperty("out") private val outputs:
List[RuleOutputParam]
+ @JsonProperty("in.dataframe.name") private val inDfName:
String = null,
+ @JsonProperty("out.dataframe.name") private val
outDfName: String = null,
+ @JsonProperty("rule") private val rule: String = null,
+ @JsonProperty("details") private val details: Map[String,
Any] = null,
+ @JsonProperty("cache") private val cache: Boolean = false,
+ @JsonProperty("out") private val outputs:
List[RuleOutputParam] = null
) extends Param {
def getDslType: DslType = if (dslType != null) DslType(dslType) else
DslType("")
def getDqType: DqType = if (dqType != null) DqType(dqType) else DqType("")
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/791c502d/measure/src/main/scala/org/apache/griffin/measure/step/builder/dsl/transform/AccuracyExpr2DQSteps.scala
--
diff --git
a/measure/src/main/scala/org/apache/griffin/measure/step/builder/dsl/transform/AccuracyExpr2DQSteps.scala
b/measure/src/main/scala/org/apache/griffin/measure/step/builder/dsl/transform/AccuracyExpr2DQSteps.scala
index 3bf7d04..f7ff3ef 100644
---
a/measure/src/main/scala/org/apache/griffin/measure/step/
[1/2] incubator-griffin git commit: Fix a bug in postman script
Repository: incubator-griffin
Updated Branches:
refs/heads/master 73b495b56 -> cc35024a6
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/cc35024a/griffin-doc/service/postman/griffin.json
--
diff --git a/griffin-doc/service/postman/griffin.json
b/griffin-doc/service/postman/griffin.json
index 08b0701..ac64412 100644
--- a/griffin-doc/service/postman/griffin.json
+++ b/griffin-doc/service/postman/griffin.json
@@ -1,3254 +1,2952 @@
{
- "id": "b7b709f1-e966-c33c-6bc6-4164f2faf0e5",
- "name": "Griffin Service",
- "description": "",
- "order": [],
- "folders": [
+ "info": {
+ "_postman_id": "3afd5132-1e4a-4052-8f0a-c594b73d61d2",
+ "name": "Griffin Service",
+ "schema":
"https://schema.getpostman.com/json/collection/v2.1.0/collection.json";
+ },
+ "item": [
{
- "name": "Auth",
- "description": "user authentication",
- "collectionId": "b7b709f1-e966-c33c-6bc6-4164f2faf0e5",
- "order": [
- "eb227a73-9249-fc16-5922-6e80cc0bea95"
- ],
- "owner": "2830994",
- "folders_order": [],
- "id": "2d181fe4-1f72-5252-8e9f-79c715266962"
- },
- {
- "name": "Basic",
- "description": "",
- "collectionId": "b7b709f1-e966-c33c-6bc6-4164f2faf0e5",
- "order": [
- "5a64e424-ae7b-55b3-9221-ecde940426bd"
- ],
- "owner": "2830994",
- "folders_order": [],
- "id": "f7cebc34-4e5a-72f7-0272-f5c8dece342d"
- },
- {
- "name": "Hive MetaStore",
- "description": "",
- "collectionId": "b7b709f1-e966-c33c-6bc6-4164f2faf0e5",
- "order": [
- "2e598ff2-2f77-5635-0a64-d7767c06adfc",
- "7f20e851-8298-2bf9-dd5b-e7266e72960d",
- "47c5b25b-f85b-ea16-fbde-e4537c0b313d",
- "9928ac7f-ceb7-0849-a06e-1bef416217a0",
- "b9c0a331-da3a-e328-1278-64d043d02841"
- ],
- "owner": "2830994",
- "folders_order": [],
- "id": "e75bc373-05d5-a00e-14f6-9aae1ba1d0e0"
- },
- {
- "name": "Jobs",
- "description": "",
- "collectionId": "b7b709f1-e966-c33c-6bc6-4164f2faf0e5",
- "order": [
- "0d61dc14-c9de-aa3d-5454-3be191a8450e",
- "89867ae6-c3f3-175c-5097-15e77e61d8e7",
- "6e764461-fb2b-ad66-b37a-04d831c4dbad",
- "3f4a8ed3-3976-92c7-c16e-0562858c975f",
- "77ed2f51-37a6-4672-de17-7fe1de169c6d",
- "384315b5-b8dc-a708-cf22-289093c2f363",
- "5388bdf6-51ed-111e-938c-0eb569dde237"
- ],
- "owner": "2830994",
- "folders_order": [],
- "id": "59294d8f-d424-590d-cfaa-e59efb36a843"
- },
- {
- "name": "Measures",
- "description": "",
- "collectionId": "b7b709f1-e966-c33c-6bc6-4164f2faf0e5",
- "order": [
- "96a777d9-28c1-331e-48d3-0b9422db7122",
- "4612699d-8772-4dd8-1b34-36141b8ccfdd",
- "b2523dcc-6abd-af6e-8e0c-759ca5c8347d",
- "c51c4335-5be3-c19b-85f9-01ce8dc94225",
- "99ea9963-f0cc-8d74-2017-ec678c5dd951",
- "a6a31a73-4b8c-7ba2-b245-3dc0f64d5f2f"
- ],
- "owner": "2830994",
- "folders_order": [
- "b74c083b-f9b7-05d4-f7fd-cb5556b5616b"
- ],
- "id": "1c9e0f01-e8b4-b9be-10c7-64a5d79f8c17"
- },
- {
- "name": "Metrics",
- "description": "",
- "collectionId": "b7b709f1-e966-c33c-6bc6-4164f2faf0e5",
- "order": [
- "7e38446b-184c-938f-0686-502d2821cd27",
- "b0f63207-b27b-fdf0-0001-6498ff7ac2c2",
-
[2/2] incubator-griffin git commit: Fix a bug in postman script
Fix a bug in postman script
postman collection is not up to date, some APIs don't work well.
script has been refreshed in this patch by postman 2.1 standard.
Jira task: GRIFFIN-204
Author: Eugene
Closes #433 from toyboxman/doc/postman.
Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/cc35024a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/cc35024a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/cc35024a
Branch: refs/heads/master
Commit: cc35024a68399984a5cc379554153ad9de954cd9
Parents: 73b495b
Author: Eugene
Authored: Sat Oct 13 11:51:23 2018 +0800
Committer: William Guo
Committed: Sat Oct 13 11:51:23 2018 +0800
--
griffin-doc/docker/griffin-docker-guide.md |6 +-
griffin-doc/img/devguide/add-job.png | Bin 0 -> 457167 bytes
griffin-doc/img/devguide/add-measure.png | Bin 0 -> 452901 bytes
griffin-doc/service/postman/griffin.json | 6018 +++
4 files changed, 2862 insertions(+), 3162 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/cc35024a/griffin-doc/docker/griffin-docker-guide.md
--
diff --git a/griffin-doc/docker/griffin-docker-guide.md
b/griffin-doc/docker/griffin-docker-guide.md
index 83a3543..a5fe98f 100644
--- a/griffin-doc/docker/griffin-docker-guide.md
+++ b/griffin-doc/docker/griffin-docker-guide.md
@@ -73,8 +73,10 @@ And change the initial environment `BASE_PATH` value to
`
4. You can try the api `Basic -> Get griffin version`, to make sure griffin
service has started up.
-5. Add an accuracy measure through api `Measures -> Add measure`, to create a
measure in griffin.
-6. Add a job to through api `jobs -> Add job`, to schedule a job to execute
the measure. In the example, the schedule interval is 5 minutes.
+5. Add an accuracy measure through api `Measures -> Add measure`, to create a
measure in griffin.
+
+6. Add a job to through api `jobs -> Add job`, to schedule a job to execute
the measure. In the example, the schedule interval is 5 minutes.
+
7. After some minutes, you can get the metrics from elasticsearch.
```
curl -XGET ':39200/griffin/accuracy/_search?pretty&filter_path=hits.hits._source'
-d '{"query":{"match_all":{}}, "sort": [{"tmst": {"order": "asc"}}]}'
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/cc35024a/griffin-doc/img/devguide/add-job.png
--
diff --git a/griffin-doc/img/devguide/add-job.png
b/griffin-doc/img/devguide/add-job.png
new file mode 100644
index 000..72ffd37
Binary files /dev/null and b/griffin-doc/img/devguide/add-job.png differ
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/cc35024a/griffin-doc/img/devguide/add-measure.png
--
diff --git a/griffin-doc/img/devguide/add-measure.png
b/griffin-doc/img/devguide/add-measure.png
new file mode 100644
index 000..427724d
Binary files /dev/null and b/griffin-doc/img/devguide/add-measure.png differ
incubator-griffin-site git commit: Updated asf-site site from master (fdde5d2b6ad5e236317764b401d93eb5d0de568d)
Repository: incubator-griffin-site Updated Branches: refs/heads/asf-site 8910ae7d5 -> 69c7309b5 Updated asf-site site from master (fdde5d2b6ad5e236317764b401d93eb5d0de568d) Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/commit/69c7309b Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/tree/69c7309b Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/diff/69c7309b Branch: refs/heads/asf-site Commit: 69c7309b5d26b81675b4c83c28721e5fc2cd2f9a Parents: 8910ae7 Author: William Guo Authored: Fri Oct 12 11:21:30 2018 +0800 Committer: William Guo Committed: Fri Oct 12 11:21:30 2018 +0800 -- README.md| 4 ++-- docs/community.html | 2 +- docs/contribute.html | 10 +- docs/profiling.html | 14 +++--- docs/quickstart.html | 12 ++-- docs/usecases.html | 12 ++-- index.html | 24 7 files changed, 39 insertions(+), 39 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/69c7309b/README.md -- diff --git a/README.md b/README.md index 75d8600..a2443d7 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Griffin Documentation Site +# Apache Griffin Documentation Site Welcome to the Apache Griffin documentation! ## Prerequisites @@ -29,7 +29,7 @@ By default, jekyll will generate the site in a `_site` directory. More content here .. ## Publishing the Apache Website -In order to publish the website, you must have committer access to Griffin's apache repository. +In order to publish the website, you must have committer access to Apache Griffin's apache repository. To publish changes, run http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/69c7309b/docs/community.html -- diff --git a/docs/community.html b/docs/community.html index 114abd9..6c3839d 100644 --- a/docs/community.html +++ b/docs/community.html @@ -217,7 +217,7 @@ under the License. Issue Tracker https://issues.apache.org/jira/browse/griffin";>https://issues.apache.org/jira/browse/griffin -Griffin PPMC And Committers +Apache Griffin PPMC And Committers http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/69c7309b/docs/contribute.html -- diff --git a/docs/contribute.html b/docs/contribute.html index df618c2..c0fff5e 100644 --- a/docs/contribute.html +++ b/docs/contribute.html @@ -139,12 +139,12 @@ under the License. File a bug report -Please let us know if you experienced a problem with Griffin and file a bug report. Open Griffinâs JIRA and click on the blue Create button at the top. Please give detailed information about the problem you encountered and, if possible, add a description that helps to reproduce the problem. +Please let us know if you experienced a problem with Griffin and file a bug report. Open Apache Griffinâs JIRA and click on the blue Create button at the top. Please give detailed information about the problem you encountered and, if possible, add a description that helps to reproduce the problem. https://issues.apache.org/jira/browse/GRIFFIN";>https://issues.apache.org/jira/browse/GRIFFIN Propose an improvement or a new feature -Our community is constantly looking for feedback to improve Apache Griffin. If you have an idea how to improve Griffin or have a new feature in mind that would be beneficial for Griffin users, please open an issue in Griffinâs JIRA. The improvement or new feature should be described in appropriate detail and include the scope and its requirements if possible. +Our community is constantly looking for feedback to improve Apache Griffin. If you have an idea how to improve Griffin or have a new feature in mind that would be beneficial for Apache Griffin users, please open an issue in Apache Griffinâs JIRA. The improvement or new feature should be described in appropriate detail and include the scope and its requirements if possible. We recommend to first reach consensus with the community on whether a new feature is required and how to implement a new feature, before starting with the implementation. @@ -153,9 +153,9 @@ under the License. Help others and join the discussions Most communication in the Apache Griffin community happens on two mailing lists: -The users mailing lists us...@griffin.incubator.apache.org is the place where users of Apache Griffin ask questions and seek for help or advice. Joining the user list and helping other users is a very good way to contribute to Griffinâs community. +The users
incubator-griffin-site git commit: rename griffin with [ Apache Griffin ]
Repository: incubator-griffin-site Updated Branches: refs/heads/master 642ca6016 -> fdde5d2b6 rename griffin with [ Apache Griffin ] Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/commit/fdde5d2b Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/tree/fdde5d2b Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/diff/fdde5d2b Branch: refs/heads/master Commit: fdde5d2b6ad5e236317764b401d93eb5d0de568d Parents: 642ca60 Author: William Guo Authored: Fri Oct 12 11:19:50 2018 +0800 Committer: William Guo Committed: Fri Oct 12 11:19:50 2018 +0800 -- README.md | 4 ++-- community.md | 2 +- contribute.md | 12 ++-- index.html| 24 profiling.md | 14 +++--- quickstart.md | 12 ++-- usecases.md | 12 ++-- 7 files changed, 40 insertions(+), 40 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/fdde5d2b/README.md -- diff --git a/README.md b/README.md index 75d8600..a2443d7 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Griffin Documentation Site +# Apache Griffin Documentation Site Welcome to the Apache Griffin documentation! ## Prerequisites @@ -29,7 +29,7 @@ By default, jekyll will generate the site in a `_site` directory. More content here .. ## Publishing the Apache Website -In order to publish the website, you must have committer access to Griffin's apache repository. +In order to publish the website, you must have committer access to Apache Griffin's apache repository. To publish changes, run http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/fdde5d2b/community.md -- diff --git a/community.md b/community.md index 24c5913..c3804d8 100644 --- a/community.md +++ b/community.md @@ -20,7 +20,7 @@ permalink: /docs/community.html -### Griffin PPMC And Committers +### Apache Griffin PPMC And Committers | Name | Apacheid | Githubid | Org | Role | |--|--|-|---|-| http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/fdde5d2b/contribute.md -- diff --git a/contribute.md b/contribute.md index 67e9888..a9a3e5b 100644 --- a/contribute.md +++ b/contribute.md @@ -11,12 +11,12 @@ The Apache Griffin community is eager to help and to answer your questions. We h - us...@griffin.incubator.apache.org , [To subscribe users list](mailto:users-subscr...@griffin.incubator.apache.org) ### File a bug report -Please let us know if you experienced a problem with Griffin and file a bug report. Open Griffinâs JIRA and click on the blue Create button at the top. Please give detailed information about the problem you encountered and, if possible, add a description that helps to reproduce the problem. +Please let us know if you experienced a problem with Griffin and file a bug report. Open Apache Griffinâs JIRA and click on the blue Create button at the top. Please give detailed information about the problem you encountered and, if possible, add a description that helps to reproduce the problem. [https://issues.apache.org/jira/browse/GRIFFIN](https://issues.apache.org/jira/browse/GRIFFIN) ### Propose an improvement or a new feature -Our community is constantly looking for feedback to improve Apache Griffin. If you have an idea how to improve Griffin or have a new feature in mind that would be beneficial for Griffin users, please open an issue in Griffinâs JIRA. The improvement or new feature should be described in appropriate detail and include the scope and its requirements if possible. +Our community is constantly looking for feedback to improve Apache Griffin. If you have an idea how to improve Griffin or have a new feature in mind that would be beneficial for Apache Griffin users, please open an issue in Apache Griffinâs JIRA. The improvement or new feature should be described in appropriate detail and include the scope and its requirements if possible. We recommend to first reach consensus with the community on whether a new feature is required and how to implement a new feature, before starting with the implementation. @@ -25,9 +25,9 @@ We recommend to first reach consensus with the community on whether a new featur ### Help others and join the discussions Most communication in the Apache Griffin community happens on two mailing lists: -The users mailing lists us...@griffin.incubator.apache.org is the place where users of A
incubator-griffin-site git commit: update names
Repository: incubator-griffin-site Updated Branches: refs/heads/master 23fc9245e -> 642ca6016 update names Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/commit/642ca601 Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/tree/642ca601 Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/diff/642ca601 Branch: refs/heads/master Commit: 642ca601612b0a617f6927ccdacbe1f710d56fe6 Parents: 23fc924 Author: DongfangLu Authored: Wed Oct 10 16:21:05 2018 +0800 Committer: DongfangLu Committed: Wed Oct 10 16:21:05 2018 +0800 -- community.md| 10 +- contributors.md | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/642ca601/community.md -- diff --git a/community.md b/community.md index 5cc..24c5913 100644 --- a/community.md +++ b/community.md @@ -27,20 +27,20 @@ permalink: /docs/community.html | Alex Lv | alexlv | alexatapache | eBay | PPMC | | Eugene Liu | liujin | toyboxman | VMWARE | Committer | | Grant | xuexu | grant-xuexu | Ontario Institute for Cancer Research | Committer | -| He Wang | wanghe | whhe | ç½æ | Committer | +| He Wang | wanghe | whhe | NetEase(ç½æ) | Committer | | Henry Saputra | hsaputra | hsaputra | ASF | Mentor | -| Jason Liao | jasonliao | jasonliaoxiaoge | å¹³å®é¶è¡ | Committer | +| Jason Liao | jasonliao | jasonliaoxiaoge | Pingan Bank(å¹³å®é¶è¡) | Committer | | John Liu | johnliu | john-liu | eBay | PPMC | | Juan Li | icesmartjuan | icesmartjuan | eBay | Committer | | Kasper Sørensen | kaspersor | kaspersorensen | Satori Software | Mentor | -| Kevin Yao | dyyao | ahutsunshine | ç¾å¢ | Committer | +| Kevin Yao | dyyao | ahutsunshine | Meituan(ç¾å¢) | Committer | | Liang Shao | liangshao | liangshao | eBay | PPMC | | Lionel Liu | lionelliu | bhlx3lyx7 | eBay | PPMC | | Luciano Resende | lresende | lresende | IBM | Mentor | | Nick Sokolov | nsokolov | chemikadze | Grid Dynamics | Committer | -| Shawn Sha | yosha | yosha1 | äº¬ä¸ | PPMC | +| Shawn Sha | yosha | yosha1 | JD(京ä¸) | PPMC | | Vincent Zhao | wenzhao | vzhao | eBay | PPMC | | William Guo | guoyp | guoyuepeng | eBay | PPMC | -| Yuqin Xuan | xuanyq | dodobel | å为 | Committer | +| Yuqin Xuan | xuanyq | dodobel | Huawei(å为) | Committer | http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/642ca601/contributors.md -- diff --git a/contributors.md b/contributors.md index 63c9ba9..592bc8b 100644 --- a/contributors.md +++ b/contributors.md @@ -14,7 +14,7 @@ permalink: /docs/contributors.html | Louise Lu | | ludongfang | eBay | Contributor | | MintL617 | | MintL617 | | Contributor | | Pan Feng | | panffeng | eBay | Contributor | -| RachelYang2 | | RachelYang2 | ä¾å¾ | Contributor | +| RachelYang2 | | RachelYang2 | Yitu(ä¾å¾) | Contributor | | Scott Ding | | dingminyi | eBay | Contributor | | Sparsh Singhal | | SparshSinghalHM | Hashmap Tech India Limited | Contributor | | Spencer Hivert | | spencer-hivert-ck | Credit Karma | Contributor | @@ -22,4 +22,4 @@ permalink: /docs/contributors.html | Yiye Fang | | yiyef | Santa Clara University | Contributor | | younglee1 | | younglee1 | | Contributor | | zornlemma | | zornlemma | eBay | Contributor | -| 诸èåæ¿ | | xiaoqiu-duan | å¯åä¼ | Contributor | +| 诸èåæ¿ | | xiaoqiu-duan | Vipshop(å¯åä¼) | Contributor |
incubator-griffin-site git commit: Updated asf-site site from master (642ca601612b0a617f6927ccdacbe1f710d56fe6)
Repository: incubator-griffin-site Updated Branches: refs/heads/asf-site 7f0624282 -> 8910ae7d5 Updated asf-site site from master (642ca601612b0a617f6927ccdacbe1f710d56fe6) Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/commit/8910ae7d Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/tree/8910ae7d Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/diff/8910ae7d Branch: refs/heads/asf-site Commit: 8910ae7d5f362e419375ea5081f9ad37099d462a Parents: 7f06242 Author: William Guo Authored: Wed Oct 10 16:24:58 2018 +0800 Committer: William Guo Committed: Wed Oct 10 16:24:58 2018 +0800 -- docs/community.html| 10 +- docs/contributors.html | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/8910ae7d/docs/community.html -- diff --git a/docs/community.html b/docs/community.html index 37674c7..114abd9 100644 --- a/docs/community.html +++ b/docs/community.html @@ -255,7 +255,7 @@ under the License. He Wang wanghe whhe - ç½æ + NetEase(ç½æ) Committer @@ -269,7 +269,7 @@ under the License. Jason Liao jasonliao jasonliaoxiaoge - å¹³å®é¶è¡ + Pingan Bank(å¹³å®é¶è¡) Committer @@ -297,7 +297,7 @@ under the License. Kevin Yao dyyao ahutsunshine - ç¾å¢ + Meituan(ç¾å¢) Committer @@ -332,7 +332,7 @@ under the License. Shawn Sha yosha yosha1 - äº¬ä¸ + JD(京ä¸) PPMC @@ -353,7 +353,7 @@ under the License. Yuqin Xuan xuanyq dodobel - å为 + Huawei(å为) Committer http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/8910ae7d/docs/contributors.html -- diff --git a/docs/contributors.html b/docs/contributors.html index 00452de..218740c 100644 --- a/docs/contributors.html +++ b/docs/contributors.html @@ -201,7 +201,7 @@ under the License. RachelYang2  RachelYang2 - ä¾å¾ + Yitu(ä¾å¾) Contributor @@ -257,7 +257,7 @@ under the License. 诸èåæ¿ Â xiaoqiu-duan - å¯åä¼ + Vipshop(å¯åä¼) Contributor
incubator-griffin-site git commit: Updated asf-site site from master (23fc9245e7bfd3657a7f3cc95bdf5c2d5e614cf7)
Repository: incubator-griffin-site Updated Branches: refs/heads/asf-site cba60a2df -> 7f0624282 Updated asf-site site from master (23fc9245e7bfd3657a7f3cc95bdf5c2d5e614cf7) Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/commit/7f062428 Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/tree/7f062428 Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/diff/7f062428 Branch: refs/heads/asf-site Commit: 7f062428230b408fbd21fb8b25270b44617c837b Parents: cba60a2 Author: William Guo Authored: Wed Oct 10 15:55:32 2018 +0800 Committer: William Guo Committed: Wed Oct 10 15:55:32 2018 +0800 -- docs/community.html| 21 +++-- docs/contributors.html | 9 + 2 files changed, 8 insertions(+), 22 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/7f062428/docs/community.html -- diff --git a/docs/community.html b/docs/community.html index be187f7..37674c7 100644 --- a/docs/community.html +++ b/docs/community.html @@ -231,13 +231,6 @@ under the License. - ahutsunshine - dyyao - ahutsunshine - ç¾å¢ - Committer - - Alex Lv alexlv alexatapache @@ -301,6 +294,13 @@ under the License. Mentor + Kevin Yao + dyyao + ahutsunshine + ç¾å¢ + Committer + + Liang Shao liangshao liangshao @@ -336,13 +336,6 @@ under the License. PPMC - Uma Maheswara Rao Gangumalla - umamahesh -  - IBM - Mentor - - Vincent Zhao wenzhao vzhao http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/7f062428/docs/contributors.html -- diff --git a/docs/contributors.html b/docs/contributors.html index bdac34a..00452de 100644 --- a/docs/contributors.html +++ b/docs/contributors.html @@ -170,13 +170,6 @@ under the License. Contributor - He Wang - wanghe - whhe - ç½æ - Committer - - Kwang-in (Dennis) Jung  djKooks @@ -256,7 +249,7 @@ under the License. zornlemma  - zhou7yuan###gmail%%%com + zornlemma eBay Contributor
incubator-griffin-site git commit: update committer list and contributor list
Repository: incubator-griffin-site Updated Branches: refs/heads/master 7d0dde910 -> 23fc9245e update committer list and contributor list Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/commit/23fc9245 Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/tree/23fc9245 Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/diff/23fc9245 Branch: refs/heads/master Commit: 23fc9245e7bfd3657a7f3cc95bdf5c2d5e614cf7 Parents: 7d0dde9 Author: Lionel Liu Authored: Wed Oct 10 10:56:49 2018 +0800 Committer: Lionel Liu Committed: Wed Oct 10 10:59:02 2018 +0800 -- community.md| 3 +-- contributors.md | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/23fc9245/community.md -- diff --git a/community.md b/community.md index 3dbf50f..5cc 100644 --- a/community.md +++ b/community.md @@ -24,7 +24,6 @@ permalink: /docs/community.html | Name | Apacheid | Githubid | Org | Role | |--|--|-|---|-| -| ahutsunshine | dyyao | ahutsunshine | ç¾å¢ | Committer | | Alex Lv | alexlv | alexatapache | eBay | PPMC | | Eugene Liu | liujin | toyboxman | VMWARE | Committer | | Grant | xuexu | grant-xuexu | Ontario Institute for Cancer Research | Committer | @@ -34,12 +33,12 @@ permalink: /docs/community.html | John Liu | johnliu | john-liu | eBay | PPMC | | Juan Li | icesmartjuan | icesmartjuan | eBay | Committer | | Kasper Sørensen | kaspersor | kaspersorensen | Satori Software | Mentor | +| Kevin Yao | dyyao | ahutsunshine | ç¾å¢ | Committer | | Liang Shao | liangshao | liangshao | eBay | PPMC | | Lionel Liu | lionelliu | bhlx3lyx7 | eBay | PPMC | | Luciano Resende | lresende | lresende | IBM | Mentor | | Nick Sokolov | nsokolov | chemikadze | Grid Dynamics | Committer | | Shawn Sha | yosha | yosha1 | äº¬ä¸ | PPMC | -| Uma Maheswara Rao Gangumalla | umamahesh | | IBM | Mentor | | Vincent Zhao | wenzhao | vzhao | eBay | PPMC | | William Guo | guoyp | guoyuepeng | eBay | PPMC | | Yuqin Xuan | xuanyq | dodobel | å为 | Committer | http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/23fc9245/contributors.md -- diff --git a/contributors.md b/contributors.md index a4ee756..63c9ba9 100644 --- a/contributors.md +++ b/contributors.md @@ -10,7 +10,6 @@ permalink: /docs/contributors.html | edwardhupeng | | EdwardHoot | Alipay | Contributor | | Evan Wan | | evanwan87 | eBay | Contributor | | forshareIT | | forshareIT | | Contributor | -| He Wang | wanghe | whhe | ç½æ | Committer | | Kwang-in (Dennis) Jung | | djKooks | | Contributor | | Louise Lu | | ludongfang | eBay | Contributor | | MintL617 | | MintL617 | | Contributor | @@ -22,5 +21,5 @@ permalink: /docs/contributors.html | YiliaZhang | | Yilia05 | USTC | Contributor | | Yiye Fang | | yiyef | Santa Clara University | Contributor | | younglee1 | | younglee1 | | Contributor | -| zornlemma | | zhou7yuan###gmail%%%com | eBay | Contributor | +| zornlemma | | zornlemma | eBay | Contributor | | 诸èåæ¿ | | xiaoqiu-duan | å¯åä¼ | Contributor |
incubator-griffin git commit: [GRIFFIN-195] Don't list all tables from UI
Repository: incubator-griffin
Updated Branches:
refs/heads/master cb74c3490 -> 73b495b56
[GRIFFIN-195] Don't list all tables from UI
[GRIFFIN-195]
Initially, load only list of databases and list of table names.
Table information is loaded only if user clicks on specific table.
[GRIFFIN-196]
Search by table names.
Author: Nikolay Sokolov
Closes #431 from chemikadze/GRIFFIN-193.
Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/73b495b5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/73b495b5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/73b495b5
Branch: refs/heads/master
Commit: 73b495b56526320106b935bbeb561ecdca986eed
Parents: cb74c34
Author: Nikolay Sokolov
Authored: Mon Oct 8 12:54:37 2018 +0800
Committer: Lionel Liu
Committed: Mon Oct 8 12:54:37 2018 +0800
--
griffin-doc/dev/dev-env-build.md| 6 +
.../core/metastore/hive/HiveMetaStoreProxy.java | 7 +-
.../hive/HiveMetaStoreServiceImpl.java | 4 +-
.../measure/create-measure/ac/ac.component.css | 4 +
.../measure/create-measure/ac/ac.component.html | 17 +-
.../measure/create-measure/ac/ac.component.ts | 185 +--
.../create-measure/pr/step1/step1.component.css | 4 +
.../pr/step1/step1.component.html | 6 +-
.../create-measure/pr/step1/step1.component.ts | 139 +-
.../measure-detail/measure-detail.component.ts | 2 +-
ui/angular/src/app/service/service.service.ts | 10 +-
ui/angular/src/styles.css | 10 +-
12 files changed, 277 insertions(+), 117 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/73b495b5/griffin-doc/dev/dev-env-build.md
--
diff --git a/griffin-doc/dev/dev-env-build.md b/griffin-doc/dev/dev-env-build.md
index bdf6012..d92a735 100644
--- a/griffin-doc/dev/dev-env-build.md
+++ b/griffin-doc/dev/dev-env-build.md
@@ -66,6 +66,12 @@ public BACKEND_SERVER = 'http://localhost:8080';
```
Making the change, you can start service module locally, and test your UI
module using local service.
+After that, you can run local server using following command:
+```
+cd ui/angular
+../angular/node_modules/.bin/ng serve --port 8080
+```
+
### For measure module
If you only wanna develop the measure module, you can ignore both of service
or UI module.
You can test your measure JAR built in the docker container, using the existed
spark environment.
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/73b495b5/service/src/main/java/org/apache/griffin/core/metastore/hive/HiveMetaStoreProxy.java
--
diff --git
a/service/src/main/java/org/apache/griffin/core/metastore/hive/HiveMetaStoreProxy.java
b/service/src/main/java/org/apache/griffin/core/metastore/hive/HiveMetaStoreProxy.java
index 079cede..adb71e9 100644
---
a/service/src/main/java/org/apache/griffin/core/metastore/hive/HiveMetaStoreProxy.java
+++
b/service/src/main/java/org/apache/griffin/core/metastore/hive/HiveMetaStoreProxy.java
@@ -23,6 +23,7 @@ import javax.annotation.PreDestroy;
import org.apache.hadoop.hive.conf.HiveConf;
import org.apache.hadoop.hive.metastore.HiveMetaStoreClient;
+import org.apache.hadoop.hive.metastore.IMetaStoreClient;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value;
@@ -52,10 +53,10 @@ public class HiveMetaStoreProxy {
@Value("${hive.hmshandler.retry.interval}")
private String interval;
-private HiveMetaStoreClient client = null;
+private IMetaStoreClient client = null;
@Bean
-public HiveMetaStoreClient initHiveMetastoreClient() {
+public IMetaStoreClient initHiveMetastoreClient() {
HiveConf hiveConf = new HiveConf();
hiveConf.set("hive.metastore.local", "false");
hiveConf.setIntVar(HiveConf.ConfVars.METASTORETHRIFTCONNECTIONRETRIES,
@@ -64,7 +65,7 @@ public class HiveMetaStoreProxy {
hiveConf.setIntVar(HiveConf.ConfVars.HMSHANDLERATTEMPTS, attempts);
hiveConf.setVar(HiveConf.ConfVars.HMSHANDLERINTERVAL, interval);
try {
-client = new HiveMetaStoreClient(hiveConf);
+client = HiveMetaStoreClient.newSynchronizedClient(new
HiveMetaStoreClient(hiveConf));
} catch (Exception e) {
LOGGER.error("Failed to connect hive metastore. {}", e);
}
http:/
incubator-griffin git commit: Fix doc issue.
Repository: incubator-griffin Updated Branches: refs/heads/master 69b666e58 -> cb74c3490 Fix doc issue. dsl-guide describes two kinds of rules, Uniqueness and Distinctness. actually they are similiar rule, so we merely keep Uniqueness rule. Author: Eugene Closes #420 from toyboxman/doc/dsl-guide. Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/cb74c349 Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/cb74c349 Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/cb74c349 Branch: refs/heads/master Commit: cb74c34909055540a260b6f2630274fabfadc0b8 Parents: 69b666e Author: Eugene Authored: Mon Oct 8 09:43:52 2018 +0800 Committer: Lionel Liu Committed: Mon Oct 8 09:43:52 2018 +0800 -- griffin-doc/measure/dsl-guide.md | 31 ++- 1 file changed, 6 insertions(+), 25 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/cb74c349/griffin-doc/measure/dsl-guide.md -- diff --git a/griffin-doc/measure/dsl-guide.md b/griffin-doc/measure/dsl-guide.md index e3b26ab..779ea6a 100644 --- a/griffin-doc/measure/dsl-guide.md +++ b/griffin-doc/measure/dsl-guide.md @@ -18,15 +18,15 @@ under the License. --> # Apache Griffin DSL Guide -Griffin DSL is designed for DQ measurement, as a SQL-like language, trying to describe the DQ domain request. +Griffin DSL is designed for DQ measurement, as a SQL-like language, which describes the DQ domain request. ## Griffin DSL Syntax Description -Griffin DSL is SQL-like, case insensitive, and easy to learn. +Griffin DSL syntax is easy to learn as it's SQL-like, case insensitive. ### Supporting process -- logical operation: not, and, or, in, between, like, is null, is nan, =, !=, <>, <=, >=, <, > -- mathematical operation: +, -, *, /, % -- sql statement: as, where, group by, having, order by, limit +- logical operation: `not, and, or, in, between, like, is null, is nan, =, !=, <>, <=, >=, <, >` +- mathematical operation: `+, -, *, /, %` +- sql statement: `as, where, group by, having, order by, limit` ### Keywords - `null, nan, true, false` @@ -57,7 +57,7 @@ Griffin DSL is SQL-like, case insensitive, and easy to learn. e.g. `*`, `source.*`, `target.*` - **field selection**: field name or with data source name ahead. e.g. `source.age`, `target.name`, `user_id` -- **index selection**: interget between square brackets "[]" with field name ahead. +- **index selection**: integer between square brackets "[]" with field name ahead. e.g. `source.attributes[3]` - **function selection**: function name with brackets "()", with field name ahead or not. e.g. `count(*)`, `*.count()`, `source.user_id.count()`, `max(source.age)` @@ -121,10 +121,6 @@ Accuracy rule expression in Griffin DSL is a logical expression, telling the map Profiling rule expression in Griffin DSL is a sql-like expression, with select clause ahead, following optional from clause, where clause, group-by clause, order-by clause, limit clause in order. e.g. `source.gender, source.id.count() where source.age > 20 group by source.gender`, `select country, max(age), min(age), count(*) as cnt from source group by country order by cnt desc limit 5` -### Uniqueness Rule -Uniqueness rule expression in Griffin DSL is a list of selection expressions separated by comma, indicates the columns to check if is unique. - e.g. `name, age`, `name, (age + 1) as next_age` - ### Distinctness Rule Distinctness rule expression in Griffin DSL is a list of selection expressions separated by comma, indicates the columns to check if is distinct. e.g. `name, age`, `name, (age + 1) as next_age` @@ -155,21 +151,6 @@ For example, the dsl rule is `source.cntry, source.id.count(), source.age.max() After the translation, the metrics will be persisted in table `profiling`. -### Uniqueness -For uniqueness, or called duplicate, is to find out the duplicate items of data, and rollup the items count group by duplicate times. -For example, the dsl rule is `name, age`, which represents the duplicate requests, in this case, source and target are the same data set. After the translation, the sql rule is as below: -- **get distinct items from source**: `SELECT name, age FROM source`, save as table `src`. -- **get all items from target**: `SELECT name, age FROM target`, save as table `tgt`. -- **join two tables**: `SELECT src.name, src.age FROM tgt RIGHT JOIN src ON coalesce(src.name, '') = coalesce(tgt.name, '') AND coalesce(src.age, '') = coalesce(tgt.age, '')`, save as table `joined`. -- **get items duplication**: `SELECT name, age, (count(*) - 1) AS dup FROM joined GROUP BY name
incubator-griffin-site git commit: Updated asf-site site from master (7d0dde910385325eac2f6b0ead1d40e216037c4b)
Repository: incubator-griffin-site Updated Branches: refs/heads/asf-site ca28fc3af -> cba60a2df Updated asf-site site from master (7d0dde910385325eac2f6b0ead1d40e216037c4b) Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/commit/cba60a2d Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/tree/cba60a2d Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/diff/cba60a2d Branch: refs/heads/asf-site Commit: cba60a2df301f45b70b8f50096fd458838e6500d Parents: ca28fc3 Author: William Guo Authored: Mon Oct 8 08:50:39 2018 +0800 Committer: William Guo Committed: Mon Oct 8 08:50:39 2018 +0800 -- docs/community.html| 7 +++ docs/contributors.html | 7 --- 2 files changed, 7 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/cba60a2d/docs/community.html -- diff --git a/docs/community.html b/docs/community.html index 5974c34..be187f7 100644 --- a/docs/community.html +++ b/docs/community.html @@ -322,6 +322,13 @@ under the License. Mentor + Nick Sokolov + nsokolov + chemikadze + Grid Dynamics + Committer + + Shawn Sha yosha yosha1 http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/cba60a2d/docs/contributors.html -- diff --git a/docs/contributors.html b/docs/contributors.html index 35b2a71..bdac34a 100644 --- a/docs/contributors.html +++ b/docs/contributors.html @@ -198,13 +198,6 @@ under the License. Contributor - Nikolay -  - chemikadze - Grid Dynamics - Contributor - - Pan Feng  panffeng
incubator-griffin-site git commit: remove ds_store
Repository: incubator-griffin-site Updated Branches: refs/heads/master 015ea0ac2 -> 7d0dde910 remove ds_store Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/commit/7d0dde91 Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/tree/7d0dde91 Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/diff/7d0dde91 Branch: refs/heads/master Commit: 7d0dde910385325eac2f6b0ead1d40e216037c4b Parents: 015ea0a Author: William Guo Authored: Mon Oct 8 08:49:06 2018 +0800 Committer: William Guo Committed: Mon Oct 8 08:49:06 2018 +0800 -- .DS_Store | Bin 6148 -> 0 bytes .gitignore | 1 + 2 files changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/7d0dde91/.DS_Store -- diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 50c27e7..000 Binary files a/.DS_Store and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/7d0dde91/.gitignore -- diff --git a/.gitignore b/.gitignore index df930a8..057179b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ .idea/ .sass-cache/ _site/ +.DS_Store
[2/4] incubator-griffin-site git commit: Update contributors.md
Update contributors.md Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/commit/acf784bd Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/tree/acf784bd Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/diff/acf784bd Branch: refs/heads/master Commit: acf784bd823e6386cbb267992efcbe4b614c0d93 Parents: b0a5629 Author: William Guo Authored: Mon Oct 8 04:49:13 2018 +0800 Committer: GitHub Committed: Mon Oct 8 04:49:13 2018 +0800 -- contributors.md | 1 - 1 file changed, 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/acf784bd/contributors.md -- diff --git a/contributors.md b/contributors.md index 268ea49..a4ee756 100644 --- a/contributors.md +++ b/contributors.md @@ -14,7 +14,6 @@ permalink: /docs/contributors.html | Kwang-in (Dennis) Jung | | djKooks | | Contributor | | Louise Lu | | ludongfang | eBay | Contributor | | MintL617 | | MintL617 | | Contributor | -| Nikolay | | chemikadze | Grid Dynamics | Contributor | | Pan Feng | | panffeng | eBay | Contributor | | RachelYang2 | | RachelYang2 | ä¾å¾ | Contributor | | Scott Ding | | dingminyi | eBay | Contributor |
[1/4] incubator-griffin-site git commit: Update community.md
Repository: incubator-griffin-site Updated Branches: refs/heads/master 93458d9a3 -> 015ea0ac2 Update community.md Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/commit/b0a5629a Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/tree/b0a5629a Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/diff/b0a5629a Branch: refs/heads/master Commit: b0a5629abcc14402afa05e0c8fe585aefb35d044 Parents: 93458d9 Author: William Guo Authored: Mon Oct 8 04:46:13 2018 +0800 Committer: GitHub Committed: Mon Oct 8 04:46:13 2018 +0800 -- community.md | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/b0a5629a/community.md -- diff --git a/community.md b/community.md index af3dc8e..c8d3444 100644 --- a/community.md +++ b/community.md @@ -37,6 +37,7 @@ permalink: /docs/community.html | Liang Shao | liangshao | liangshao | eBay | PPMC | | Lionel Liu | lionelliu | bhlx3lyx7 | eBay | PPMC | | Luciano Resende | lresende | lresende | IBM | Mentor | +| Nick Sokolov | nsokolov | chemikadze | | Committer | | Shawn Sha | yosha | yosha1 | äº¬ä¸ | PPMC | | Uma Maheswara Rao Gangumalla | umamahesh | | IBM | Mentor | | Vincent Zhao | wenzhao | vzhao | eBay | PPMC |
[4/4] incubator-griffin-site git commit: update committer by This closes #10, and remove invalid PRs by This closes #1, This closes #2, This closes #3
update committer by This closes #10, and remove invalid PRs by This closes #1, This closes #2, This closes #3 Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/commit/015ea0ac Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/tree/015ea0ac Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/diff/015ea0ac Branch: refs/heads/master Commit: 015ea0ac2d1256e9623d559045249692dc16d51d Parents: 62bfac6 Author: William Guo Authored: Mon Oct 8 08:45:55 2018 +0800 Committer: William Guo Committed: Mon Oct 8 08:45:55 2018 +0800 -- .DS_Store | Bin 6148 -> 6148 bytes 1 file changed, 0 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/015ea0ac/.DS_Store -- diff --git a/.DS_Store b/.DS_Store index 10f526f..50c27e7 100644 Binary files a/.DS_Store and b/.DS_Store differ
[3/4] incubator-griffin-site git commit: Update community.md
Update community.md Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/commit/62bfac66 Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/tree/62bfac66 Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/diff/62bfac66 Branch: refs/heads/master Commit: 62bfac66359244dee50b63fe5009b46008fc3368 Parents: acf784b Author: William Guo Authored: Mon Oct 8 04:50:11 2018 +0800 Committer: GitHub Committed: Mon Oct 8 04:50:11 2018 +0800 -- community.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/62bfac66/community.md -- diff --git a/community.md b/community.md index c8d3444..3dbf50f 100644 --- a/community.md +++ b/community.md @@ -37,7 +37,7 @@ permalink: /docs/community.html | Liang Shao | liangshao | liangshao | eBay | PPMC | | Lionel Liu | lionelliu | bhlx3lyx7 | eBay | PPMC | | Luciano Resende | lresende | lresende | IBM | Mentor | -| Nick Sokolov | nsokolov | chemikadze | | Committer | +| Nick Sokolov | nsokolov | chemikadze | Grid Dynamics | Committer | | Shawn Sha | yosha | yosha1 | äº¬ä¸ | PPMC | | Uma Maheswara Rao Gangumalla | umamahesh | | IBM | Mentor | | Vincent Zhao | wenzhao | vzhao | eBay | PPMC |
incubator-griffin git commit: remove duplicated cache settings
Repository: incubator-griffin Updated Branches: refs/heads/master 3a09899ea -> 69b666e58 remove duplicated cache settings Author: William Guo Closes #430 from guoyuepeng/remove_dup_cache_in_travis. Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/69b666e5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/69b666e5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/69b666e5 Branch: refs/heads/master Commit: 69b666e58cbf00520d9bb31db85a3bd1843c7a75 Parents: 3a09899 Author: William Guo Authored: Tue Oct 2 23:07:56 2018 +0800 Committer: William Guo Committed: Tue Oct 2 23:07:56 2018 +0800 -- .travis.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/69b666e5/.travis.yml -- diff --git a/.travis.yml b/.travis.yml index d938d39..9d22289 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,8 +29,6 @@ cache: install: - npm install -g bower +# keep 30, need change according to ci logs. script: travis_wait 30 mvn clean verify -q -cache: - directories: - - $HOME/.m2
incubator-griffin git commit: Fix timeout failure in travis CI.
Repository: incubator-griffin Updated Branches: refs/heads/master 2ce6115e0 -> 3a09899ea Fix timeout failure in travis CI. Build times out because no output was received. 'travis_wait mvn clean verify -q' will spawn a process to deal with mvn task -q,--quiet Quiet output - only show errors -q probably leads no output caught by travis, so timeout failure happens refer to: https://docs.travis-ci.com/user/common-build-problems/#limitations-of-travis_wait Author: Eugene Closes #429 from toyboxman/build/tarvis. Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/3a09899e Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/3a09899e Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/3a09899e Branch: refs/heads/master Commit: 3a09899ea8034c27ec8e3eda6eaa6f088a62f0b0 Parents: 2ce6115 Author: Eugene Authored: Tue Oct 2 23:01:05 2018 +0800 Committer: William Guo Committed: Tue Oct 2 23:01:05 2018 +0800 -- .travis.yml | 5 + 1 file changed, 5 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/3a09899e/.travis.yml -- diff --git a/.travis.yml b/.travis.yml index c344291..d938d39 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,6 +20,11 @@ scala: - 2.10.6 node_js: - "6" +git: + quiet: true +cache: + directories: + - $HOME/.m2 install: - npm install -g bower
incubator-griffin git commit: Increase build silence timeout
Repository: incubator-griffin Updated Branches: refs/heads/master 5d7ef04c6 -> 2ce6115e0 Increase build silence timeout According to experiment, resolving dependencies takes longer than default build timeout of 20 minutes. Increasing to 30. [Experiment](https://travis-ci.org/apache/incubator-griffin/builds/435326777) shown that sometimes it takes more than 20 minutes to download all the dependencies and start executing tests. In that particular experiment it took 22 minutes in order to get to test execution. Author: Nikolay Sokolov Closes #428 from chemikadze/increase-build-timeout. Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/2ce6115e Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/2ce6115e Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/2ce6115e Branch: refs/heads/master Commit: 2ce6115e00fae0b5486ddf9eecb91f37bc51cdd1 Parents: 5d7ef04 Author: Nikolay Sokolov Authored: Mon Oct 1 23:07:06 2018 +0800 Committer: William Guo Committed: Mon Oct 1 23:07:06 2018 +0800 -- .travis.yml | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/2ce6115e/.travis.yml -- diff --git a/.travis.yml b/.travis.yml index 713b27e..c344291 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,4 +24,8 @@ node_js: install: - npm install -g bower -script: travis_wait mvn clean verify -q +script: travis_wait 30 mvn clean verify -q + +cache: + directories: + - $HOME/.m2
incubator-griffin git commit: Fix code bug.
Repository: incubator-griffin
Updated Branches:
refs/heads/master 3dda6b345 -> 5d7ef04c6
Fix code bug.
1.add java method description
2.reformat import statements violating Griffin's code rule
https://github.com/apache/incubator-griffin/blob/master/griffin-doc/dev/code-style.md
Author: Eugene
Closes #426 from toyboxman/src/service.
Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/5d7ef04c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/5d7ef04c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/5d7ef04c
Branch: refs/heads/master
Commit: 5d7ef04c6895c67235052fb85781fcf87102c84d
Parents: 3dda6b3
Author: Eugene
Authored: Mon Oct 1 23:02:13 2018 +0800
Committer: William Guo
Committed: Mon Oct 1 23:02:13 2018 +0800
--
.../apache/griffin/core/util/YarnNetUtil.java | 23 ++--
1 file changed, 21 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/5d7ef04c/service/src/main/java/org/apache/griffin/core/util/YarnNetUtil.java
--
diff --git
a/service/src/main/java/org/apache/griffin/core/util/YarnNetUtil.java
b/service/src/main/java/org/apache/griffin/core/util/YarnNetUtil.java
index 71308ab..ba0a2e0 100644
--- a/service/src/main/java/org/apache/griffin/core/util/YarnNetUtil.java
+++ b/service/src/main/java/org/apache/griffin/core/util/YarnNetUtil.java
@@ -19,6 +19,8 @@ under the License.
package org.apache.griffin.core.util;
+import static org.apache.griffin.core.job.entity.LivySessionStates.State.DEAD;
+
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import org.apache.commons.lang.StringUtils;
@@ -30,13 +32,17 @@ import org.springframework.http.HttpStatus;
import org.springframework.web.client.HttpClientErrorException;
import org.springframework.web.client.RestTemplate;
-import static org.apache.griffin.core.job.entity.LivySessionStates.State.DEAD;
-
public class YarnNetUtil {
private static final Logger LOGGER = LoggerFactory
.getLogger(YarnNetUtil.class);
private static RestTemplate restTemplate = new RestTemplate();
+/**
+ * delete app task scheduling by yarn.
+ *
+ * @param url prefix part of whole url
+ * @param appId application id
+ */
public static void delete(String url, String appId) {
try {
if (appId != null) {
@@ -53,6 +59,13 @@ public class YarnNetUtil {
}
}
+/**
+ * update app task scheduling by yarn.
+ *
+ * @param url prefix part of whole url
+ * @param instance job instance
+ * @return
+ */
public static boolean update(String url, JobInstanceBean instance) {
try {
url += "/ws/v1/cluster/apps/" + instance.getAppId();
@@ -76,6 +89,12 @@ public class YarnNetUtil {
return false;
}
+/**
+ * parse json string and get app json object.
+ *
+ * @param json json string
+ * @return
+ */
public static JsonObject parse(String json) {
if (StringUtils.isEmpty(json)) {
LOGGER.warn("Input string is empty.");
incubator-griffin git commit: [GRIFFIN-197] Treat non-existing YARN app as FAILED
Repository: incubator-griffin
Updated Branches:
refs/heads/master 18fc4cf4c -> 3dda6b345
[GRIFFIN-197] Treat non-existing YARN app as FAILED
This avoids jobs becoming stuck in UNKNOWN state on Service side.
Also, improves logging for YARN client errors.
Author: Nikolay Sokolov
Closes #421 from chemikadze/GRIFFIN-197.
Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/3dda6b34
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/3dda6b34
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/3dda6b34
Branch: refs/heads/master
Commit: 3dda6b3459d2b3d9f091545e49e156ca5f230e2d
Parents: 18fc4cf
Author: Nikolay Sokolov
Authored: Sun Sep 30 15:09:16 2018 +0800
Committer: William Guo
Committed: Sun Sep 30 15:09:16 2018 +0800
--
.../org/apache/griffin/core/util/YarnNetUtil.java | 16 +++-
1 file changed, 15 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/3dda6b34/service/src/main/java/org/apache/griffin/core/util/YarnNetUtil.java
--
diff --git
a/service/src/main/java/org/apache/griffin/core/util/YarnNetUtil.java
b/service/src/main/java/org/apache/griffin/core/util/YarnNetUtil.java
index f935aad..71308ab 100644
--- a/service/src/main/java/org/apache/griffin/core/util/YarnNetUtil.java
+++ b/service/src/main/java/org/apache/griffin/core/util/YarnNetUtil.java
@@ -21,14 +21,17 @@ package org.apache.griffin.core.util;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
-
import org.apache.commons.lang.StringUtils;
import org.apache.griffin.core.job.entity.JobInstanceBean;
import org.apache.griffin.core.job.entity.LivySessionStates;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.client.HttpClientErrorException;
import org.springframework.web.client.RestTemplate;
+import static org.apache.griffin.core.job.entity.LivySessionStates.State.DEAD;
+
public class YarnNetUtil {
private static final Logger LOGGER = LoggerFactory
.getLogger(YarnNetUtil.class);
@@ -42,6 +45,9 @@ public class YarnNetUtil {
+ appId + "/state",
"{\"state\": \"KILLED\"}");
}
+} catch (HttpClientErrorException e) {
+LOGGER.warn("client error {} from yarn: {}",
+e.getMessage(), e.getResponseBodyAsString());
} catch (Exception e) {
LOGGER.error("delete exception happens by yarn. {}", e);
}
@@ -56,6 +62,14 @@ public class YarnNetUtil {
instance.setState(LivySessionStates.toLivyState(state));
}
return true;
+} catch (HttpClientErrorException e) {
+LOGGER.warn("client error {} from yarn: {}",
+e.getMessage(), e.getResponseBodyAsString());
+if (e.getStatusCode() == HttpStatus.NOT_FOUND) {
+// in sync with Livy behavior, see
com.cloudera.livy.utils.SparkYarnApp
+instance.setState(DEAD);
+return true;
+}
} catch (Exception e) {
LOGGER.error("update exception happens by yarn. {}", e);
}
[2/3] incubator-griffin git commit: Fix case clauses
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/18fc4cf4/measure/src/main/scala/org/apache/griffin/measure/sink/ElasticSearchSink.scala
--
diff --git
a/measure/src/main/scala/org/apache/griffin/measure/sink/ElasticSearchSink.scala
b/measure/src/main/scala/org/apache/griffin/measure/sink/ElasticSearchSink.scala
index e5f72d1..3c20a0e 100644
---
a/measure/src/main/scala/org/apache/griffin/measure/sink/ElasticSearchSink.scala
+++
b/measure/src/main/scala/org/apache/griffin/measure/sink/ElasticSearchSink.scala
@@ -18,11 +18,13 @@ under the License.
*/
package org.apache.griffin.measure.sink
-import org.apache.griffin.measure.utils.ParamUtil._
-import org.apache.griffin.measure.utils.{HttpUtil, JsonUtil, TimeUtil}
+import scala.concurrent.Future
+
import org.apache.spark.rdd.RDD
-import scala.concurrent.Future
+import org.apache.griffin.measure.utils.{HttpUtil, JsonUtil, TimeUtil}
+import org.apache.griffin.measure.utils.ParamUtil._
+
/**
* sink metric and record through http request
@@ -38,7 +40,10 @@ case class ElasticSearchSink(config: Map[String, Any],
metricName: String,
val api = config.getString(Api, "")
val method = config.getString(Method, "post")
- val connectionTimeout =
TimeUtil.milliseconds(config.getString(ConnectionTimeout, "")).getOrElse(-1L)
+
+ val connectionTimeout =
+TimeUtil.milliseconds(config.getString(ConnectionTimeout,
"")).getOrElse(-1L)
+
val retry = config.getInt(Retry, 10)
val _Value = "value"
@@ -55,7 +60,7 @@ case class ElasticSearchSink(config: Map[String, Any],
metricName: String,
val data = JsonUtil.toJson(dataMap)
// http request
val params = Map[String, Object]()
- val header = Map[String, Object](("Content-Type","application/json"))
+ val header = Map[String, Object](("Content-Type", "application/json"))
def func(): (Long, Future[Boolean]) = {
import scala.concurrent.ExecutionContext.Implicits.global
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/18fc4cf4/measure/src/main/scala/org/apache/griffin/measure/sink/HdfsSink.scala
--
diff --git
a/measure/src/main/scala/org/apache/griffin/measure/sink/HdfsSink.scala
b/measure/src/main/scala/org/apache/griffin/measure/sink/HdfsSink.scala
index 718f1c1..588fabf 100644
--- a/measure/src/main/scala/org/apache/griffin/measure/sink/HdfsSink.scala
+++ b/measure/src/main/scala/org/apache/griffin/measure/sink/HdfsSink.scala
@@ -20,10 +20,11 @@ package org.apache.griffin.measure.sink
import java.util.Date
-import org.apache.griffin.measure.utils.ParamUtil._
-import org.apache.griffin.measure.utils.{HdfsUtil, JsonUtil}
import org.apache.spark.rdd.RDD
+import org.apache.griffin.measure.utils.{HdfsUtil, JsonUtil}
+import org.apache.griffin.measure.utils.ParamUtil._
+
/**
* sink metric and record to hdfs
*/
@@ -83,6 +84,7 @@ case class HdfsSink(config: Map[String, Any], metricName:
String, timeStamp: Lon
case e: Throwable => error(e.getMessage)
}
}
+
def finish(): Unit = {
try {
HdfsUtil.createEmptyFile(FinishFile)
@@ -103,6 +105,7 @@ case class HdfsSink(config: Map[String, Any], metricName:
String, timeStamp: Lon
private def getHdfsPath(path: String, groupId: Int): String = {
HdfsUtil.getHdfsFilePath(path, s"${groupId}")
}
+
private def getHdfsPath(path: String, ptnId: Int, groupId: Int): String = {
HdfsUtil.getHdfsFilePath(path, s"${ptnId}.${groupId}")
}
@@ -116,7 +119,10 @@ case class HdfsSink(config: Map[String, Any], metricName:
String, timeStamp: Lon
clearOldRecords(path)
try {
val recordCount = records.count
- val count = if (maxPersistLines < 0) recordCount else
scala.math.min(maxPersistLines, recordCount)
+
+ val count =
+if (maxPersistLines < 0) recordCount else
scala.math.min(maxPersistLines, recordCount)
+
if (count > 0) {
val groupCount = ((count - 1) / maxLinesPerFile + 1).toInt
if (groupCount <= 1) {
@@ -145,7 +151,10 @@ case class HdfsSink(config: Map[String, Any], metricName:
String, timeStamp: Lon
clearOldRecords(path)
try {
val recordCount = records.size
- val count = if (maxPersistLines < 0) recordCount else
scala.math.min(maxPersistLines, recordCount)
+
+ val count =
+if (maxPersistLines < 0) recordCount else
scala.math.min(maxPersistLines, recordCount)
+
if (count > 0) {
val groupCount = (count - 1) / maxLinesPerFile + 1
if (groupCount <= 1) {
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/18fc4cf4/measure/src/main/scala/org/apache/griffin/measure/sink/MongoSink.scala
--
diff --git
a/measure/src/main/scala/org/apache/griffin/measure/sink/MongoSink.scala
b/measure/src/main/scala/org/apache/grif
[3/3] incubator-griffin git commit: Fix case clauses
Fix case clauses Author: William Guo Closes #425 from guoyuepeng/fix_case_clauses. Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/18fc4cf4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/18fc4cf4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/18fc4cf4 Branch: refs/heads/master Commit: 18fc4cf4cd706aa3e793fb0790c12ece5e5342a3 Parents: 485c5cf Author: William Guo Authored: Sat Sep 29 18:21:42 2018 +0800 Committer: Lionel Liu Committed: Sat Sep 29 18:21:42 2018 +0800 -- .../apache/griffin/measure/Application.scala| 36 ++- .../configuration/dqdefinition/DQConfig.scala | 12 +- .../configuration/dqdefinition/EnvConfig.scala | 5 +- .../dqdefinition/reader/ParamFileReader.scala | 6 +- .../dqdefinition/reader/ParamJsonReader.scala | 5 +- .../dqdefinition/reader/ParamReader.scala | 5 +- .../measure/configuration/enums/DqType.scala| 8 +- .../configuration/enums/FlattenType.scala | 8 +- .../configuration/enums/OutputType.scala| 8 +- .../configuration/enums/ProcessType.scala | 6 +- .../measure/configuration/enums/SinkType.scala | 19 +- .../griffin/measure/context/DQContext.scala | 11 +- .../measure/context/DataFrameCache.scala| 12 +- .../griffin/measure/context/TableRegister.scala | 8 +- .../checkpoint/lock/CheckpointLockInZK.scala| 6 +- .../offset/OffsetCheckpointClient.scala | 2 +- .../offset/OffsetCheckpointFactory.scala| 5 +- .../offset/OffsetCheckpointInZK.scala | 29 ++- .../streaming/metric/AccuracyMetric.scala | 8 +- .../context/streaming/metric/CacheResults.scala | 6 +- .../griffin/measure/datasource/DataSource.scala | 11 +- .../measure/datasource/DataSourceFactory.scala | 8 +- .../measure/datasource/TimestampStorage.scala | 29 ++- .../datasource/cache/StreamingCacheClient.scala | 65 ++--- .../cache/StreamingCacheClientFactory.scala | 18 +- .../cache/StreamingCacheJsonClient.scala| 3 +- .../cache/StreamingCacheOrcClient.scala | 3 +- .../cache/StreamingCacheParquetClient.scala | 10 +- .../cache/StreamingOffsetCacheable.scala| 18 +- .../measure/datasource/cache/WithFanIn.scala| 8 +- .../datasource/connector/DataConnector.scala| 15 +- .../connector/DataConnectorFactory.scala| 35 ++- .../batch/AvroBatchDataConnector.scala | 6 +- .../batch/HiveBatchDataConnector.scala | 6 +- .../batch/TextDirBatchDataConnector.scala | 18 +- .../streaming/KafkaStreamingDataConnector.scala | 6 +- .../KafkaStreamingStringDataConnector.scala | 12 +- .../streaming/StreamingDataConnector.scala | 10 +- .../measure/job/builder/DQJobBuilder.scala | 2 - .../apache/griffin/measure/launch/DQApp.scala | 3 +- .../measure/launch/batch/BatchDQApp.scala | 10 +- .../launch/streaming/StreamingDQApp.scala | 19 +- .../griffin/measure/sink/ConsoleSink.scala | 3 +- .../measure/sink/ElasticSearchSink.scala| 15 +- .../apache/griffin/measure/sink/HdfsSink.scala | 17 +- .../apache/griffin/measure/sink/MongoSink.scala | 10 +- .../org/apache/griffin/measure/sink/Sink.scala | 3 +- .../griffin/measure/sink/SinkFactory.scala | 3 +- .../griffin/measure/sink/SinkTaskRunner.scala | 18 +- .../measure/step/builder/DQStepBuilder.scala| 10 +- .../step/builder/GriffinDslDQStepBuilder.scala | 4 +- .../step/builder/RuleParamStepBuilder.scala | 4 +- .../builder/dsl/expr/ClauseExpression.scala | 14 +- .../step/builder/dsl/expr/LogicalExpr.scala | 5 +- .../step/builder/dsl/expr/SelectExpr.scala | 8 +- .../step/builder/dsl/expr/TreeNode.scala| 18 +- .../step/builder/dsl/parser/BasicParser.scala | 6 +- .../builder/dsl/parser/GriffinDslParser.scala | 5 +- .../dsl/transform/AccuracyExpr2DQSteps.scala| 55 +++-- .../transform/CompletenessExpr2DQSteps.scala| 40 +-- .../transform/DistinctnessExpr2DQSteps.scala| 48 ++-- .../builder/dsl/transform/Expr2DQSteps.scala| 2 +- .../dsl/transform/ProfilingExpr2DQSteps.scala | 16 +- .../dsl/transform/TimelinessExpr2DQSteps.scala | 46 ++-- .../dsl/transform/UniquenessExpr2DQSteps.scala | 34 ++- .../transform/analyzer/AccuracyAnalyzer.scala | 6 +- .../analyzer/CompletenessAnalyzer.scala | 3 +- .../analyzer/DistinctnessAnalyzer.scala | 4 +- .../transform/analyzer/ProfilingAnalyzer.scala | 3 +- .../transform/analyzer/UniquenessAnalyzer.scala | 3 +- .../builder/preproc/PreProcParamMaker.scala | 8 +- .../griffin/measure/step/read/ReadStep.scala| 9 +- .../measure/step/read/UnionReadStep.scala | 3 +- .../measure/step/transform/DataFrameOps.scala | 16 +- .../t
[1/3] incubator-griffin git commit: Fix case clauses
Repository: incubator-griffin
Updated Branches:
refs/heads/master 485c5cfc7 -> 18fc4cf4c
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/18fc4cf4/measure/src/main/scala/org/apache/griffin/measure/step/write/RecordWriteStep.scala
--
diff --git
a/measure/src/main/scala/org/apache/griffin/measure/step/write/RecordWriteStep.scala
b/measure/src/main/scala/org/apache/griffin/measure/step/write/RecordWriteStep.scala
index 2bc373c..1fef694 100644
---
a/measure/src/main/scala/org/apache/griffin/measure/step/write/RecordWriteStep.scala
+++
b/measure/src/main/scala/org/apache/griffin/measure/step/write/RecordWriteStep.scala
@@ -18,12 +18,13 @@ under the License.
*/
package org.apache.griffin.measure.step.write
+import org.apache.spark.rdd.RDD
+import org.apache.spark.sql._
+
import org.apache.griffin.measure.configuration.enums._
import org.apache.griffin.measure.context.DQContext
import org.apache.griffin.measure.step.builder.ConstantColumns
import org.apache.griffin.measure.utils.JsonUtil
-import org.apache.spark.rdd.RDD
-import org.apache.spark.sql._
/**
* write records needs to be sink
@@ -39,18 +40,16 @@ case class RecordWriteStep(name: String,
val writeMode = writeTimestampOpt.map(_ =>
SimpleMode).getOrElse(context.writeMode)
writeMode match {
- case SimpleMode => {
+ case SimpleMode =>
// batch records
val recordsOpt = getBatchRecords(context)
// write records
recordsOpt match {
- case Some(records) => {
+ case Some(records) =>
context.getSink(timestamp).sinkRecords(records, name)
- }
- case _ => {}
+ case _ =>
}
- }
- case TimestampMode => {
+ case TimestampMode =>
// streaming records
val (recordsOpt, emptyTimestamps) = getStreamingRecords(context)
// write records
@@ -63,7 +62,6 @@ case class RecordWriteStep(name: String,
emptyTimestamps.foreach { t =>
context.getSink(t).sinkRecords(Nil, name)
}
- }
}
true
}
@@ -81,28 +79,31 @@ case class RecordWriteStep(name: String,
val df = context.sqlContext.table(s"`${name}`")
Some(df)
} catch {
- case e: Throwable => {
+ case e: Throwable =>
error(s"get data frame ${name} fails")
None
- }
}
}
- private def getRecordDataFrame(context: DQContext): Option[DataFrame] =
getDataFrame(context, inputName)
+ private def getRecordDataFrame(context: DQContext): Option[DataFrame]
+= getDataFrame(context, inputName)
- private def getFilterTableDataFrame(context: DQContext): Option[DataFrame] =
filterTableNameOpt.flatMap(getDataFrame(context, _))
+ private def getFilterTableDataFrame(context: DQContext): Option[DataFrame]
+= filterTableNameOpt.flatMap(getDataFrame(context, _))
private def getBatchRecords(context: DQContext): Option[RDD[String]] = {
getRecordDataFrame(context).map(_.toJSON.rdd);
}
- private def getStreamingRecords(context: DQContext): (Option[RDD[(Long,
Iterable[String])]], Set[Long]) = {
+ private def getStreamingRecords(context: DQContext)
+: (Option[RDD[(Long, Iterable[String])]], Set[Long])
+= {
implicit val encoder = Encoders.tuple(Encoders.scalaLong, Encoders.STRING)
val defTimestamp = context.contextId.timestamp
getRecordDataFrame(context) match {
- case Some(df) => {
+ case Some(df) =>
val (filterFuncOpt, emptyTimestamps) =
getFilterTableDataFrame(context) match {
- case Some(filterDf) => {
+ case Some(filterDf) =>
// timestamps with empty flag
val tmsts: Array[(Long, Boolean)] = (filterDf.collect.flatMap {
row =>
try {
@@ -120,13 +121,12 @@ case class RecordWriteStep(name: String,
} else None
(filterFuncOpt, emptyTmsts)
- }
case _ => (Some((t: Long) => true), Set[Long]())
}
// filter timestamps need to record
filterFuncOpt match {
- case Some(filterFunc) => {
+ case Some(filterFunc) =>
val records = df.flatMap { row =>
val tmst = getTmst(row, defTimestamp)
if (filterFunc(tmst)) {
@@ -140,10 +140,8 @@ case class RecordWriteStep(name: String,
} else None
}
(Some(records.rdd.groupByKey), emptyTimestamps)
- }
case _ => (None, emptyTimestamps)
}
- }
case _ => (None, Set[Long]())
}
}
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/18fc4cf4/measure/src/main/scala/org/apache/griffin/measure/step/write/SparkRowFormatter.scala
--
diff --git
a/measure/src/main/scala/org/apache/griffin/measure/step/write/SparkRowFormatter.scala
b/measure/src/main/scala
incubator-griffin-site git commit: update mail address
Repository: incubator-griffin-site Updated Branches: refs/heads/master ea9802342 -> 93458d9a3 update mail address Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/commit/93458d9a Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/tree/93458d9a Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/diff/93458d9a Branch: refs/heads/master Commit: 93458d9a329a5f40f95e0f241f62d18f2bef6ce3 Parents: ea98023 Author: William Guo Authored: Thu Sep 27 18:15:03 2018 +0800 Committer: William Guo Committed: Thu Sep 27 18:15:03 2018 +0800 -- _config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/93458d9a/_config.yml -- diff --git a/_config.yml b/_config.yml index a937796..9d44bc6 100644 --- a/_config.yml +++ b/_config.yml @@ -16,7 +16,7 @@ # Site settings title: Griffin -email: gu...@apache.org +email: d...@griffin.apache.org description: Apache Griffin - Big Data Quality Solution For Batch and Streaming baseurl: "" # the subpath of your site, e.g. /blog/
incubator-griffin git commit: Adjust error msg when failing to create job
Repository: incubator-griffin
Updated Branches:
refs/heads/master de578bc88 -> 485c5cfc7
Adjust error msg when failing to create job
Author: Li, Juan
Closes #423 from icesmartjuan/ui_createJobFailure_msg.
Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/485c5cfc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/485c5cfc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/485c5cfc
Branch: refs/heads/master
Commit: 485c5cfc79b84b7b63f49f7f6f3019f39037
Parents: de578bc
Author: Li, Juan
Authored: Thu Sep 27 17:28:04 2018 +0800
Committer: William Guo
Committed: Thu Sep 27 17:28:04 2018 +0800
--
ui/angular/src/app/job/create-job/batch/batch.component.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/485c5cfc/ui/angular/src/app/job/create-job/batch/batch.component.ts
--
diff --git a/ui/angular/src/app/job/create-job/batch/batch.component.ts
b/ui/angular/src/app/job/create-job/batch/batch.component.ts
index 1e2a4b2..b8f0100 100644
--- a/ui/angular/src/app/job/create-job/batch/batch.component.ts
+++ b/ui/angular/src/app/job/create-job/batch/batch.component.ts
@@ -202,7 +202,7 @@ export class BatchComponent implements OnInit,
AfterViewChecked {
if (response.code === '40004') {
this.toasterService.pop("error", "Error!", "Job name already
exists!");
} else {
- this.toasterService.pop("error", "Error!", "Error when creating
job");
+ this.toasterService.pop("error", "Error!", response.message);
}
console.log("Error when creating job");
}
incubator-griffin git commit: Minor UI fixes
Repository: incubator-griffin
Updated Branches:
refs/heads/master 5c88d9ca4 -> de578bc88
Minor UI fixes
"Back" button text alignment
https://user-images.githubusercontent.com/867294/45912572-79de5680-bdd8-11e8-9acb-19670b7ca3d7.png";>
https://user-images.githubusercontent.com/867294/45912573-7e0a7400-bdd8-11e8-9421-ef6dafc0d805.png";>
footer line intersecting with content
https://user-images.githubusercontent.com/867294/45912578-92e70780-bdd8-11e8-8b39-2485047b422d.png";>
https://user-images.githubusercontent.com/867294/45912580-97abbb80-bdd8-11e8-9a08-2b27b92a272b.png";>
title rendering on sidebar
https://user-images.githubusercontent.com/867294/45912584-a4301400-bdd8-11e8-9ffe-e726dd912813.png";>
https://user-images.githubusercontent.com/867294/45912670-0dfced80-bdda-11e8-87ae-b1985f55754e.png";>
Author: Nikolay Sokolov
Closes #422 from chemikadze/ui-fixes.
Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/de578bc8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/de578bc8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/de578bc8
Branch: refs/heads/master
Commit: de578bc8820a2a9f7658adc9fae7be7b97716d82
Parents: 5c88d9c
Author: Nikolay Sokolov
Authored: Sat Sep 22 21:56:01 2018 +0800
Committer: William Guo
Committed: Sat Sep 22 21:56:01 2018 +0800
--
ui/angular/src/app/app.component.html | 2 +-
ui/angular/src/app/sidebar/sidebar.component.css | 2 ++
ui/angular/src/app/sidebar/sidebar.component.html | 8
ui/angular/src/styles.css | 2 +-
4 files changed, 8 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/de578bc8/ui/angular/src/app/app.component.html
--
diff --git a/ui/angular/src/app/app.component.html
b/ui/angular/src/app/app.component.html
index b0c7f39..b1e5476 100644
--- a/ui/angular/src/app/app.component.html
+++ b/ui/angular/src/app/app.component.html
@@ -73,7 +73,7 @@ under the License.
spinner-on="false"
style="padding-top:56px;padding-bottom:90px;height:100%;padding-right:0;"
id="mainContent">
Back
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/de578bc8/ui/angular/src/app/sidebar/sidebar.component.css
--
diff --git a/ui/angular/src/app/sidebar/sidebar.component.css
b/ui/angular/src/app/sidebar/sidebar.component.css
index 16482b7..7a52309 100644
--- a/ui/angular/src/app/sidebar/sidebar.component.css
+++ b/ui/angular/src/app/sidebar/sidebar.component.css
@@ -34,6 +34,7 @@ under the License.
}
.well {
+ margin-bottom: 0px;
padding: 0px;
background: transparent;
border: 0px;
@@ -53,6 +54,7 @@ under the License.
position: relative;
background: transparent;
border-color: #262626;
+ border-top: 0px;
}
.side-bar-scroll {
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/de578bc8/ui/angular/src/app/sidebar/sidebar.component.html
--
diff --git a/ui/angular/src/app/sidebar/sidebar.component.html
b/ui/angular/src/app/sidebar/sidebar.component.html
index 0a445a1..f35b4d8 100644
--- a/ui/angular/src/app/sidebar/sidebar.component.html
+++ b/ui/angular/src/app/sidebar/sidebar.component.html
@@ -38,15 +38,15 @@ under the License.
-
+
{{outerItems.name}}
-
-
-
+
+
+
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/de578bc8/ui/angular/src/styles.css
--
diff --git a/ui/angular/src/styles.css b/ui/angular/src/styles.css
index 4670fdf..e84cde3 100644
--- a/ui/angular/src/styles.css
+++ b/ui/angular/src/styles.css
@@ -939,7 +939,7 @@ a:hover {
height: 20px;
background: #1f1f1f;
padding-top: 10px;
- padding-bottom: 10px;
+ padding-bottom: 0px;
border-top-style: solid;
border-top-width: 8px;
border-top-color: #1d1d1d;
incubator-griffin git commit: [GRIFFIN-198] Fix caching of incomplete results in HiveMetaStoreService
Repository: incubator-griffin
Updated Branches:
refs/heads/master 8154346f6 -> 5c88d9ca4
[GRIFFIN-198] Fix caching of incomplete results in HiveMetaStoreService
Avoiding polluting cache with empty or null values.
Test caching behavior of HiveMetaStoreServiceImpl.
Verified that cache population in evictHiveCache() is not happening, added
unittest.
This is only partial fix, getAllTable() calls still can return and cache
incomplete results.
Author: Nikolay Sokolov
Closes #419 from chemikadze/hive-caching.
Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/5c88d9ca
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/5c88d9ca
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/5c88d9ca
Branch: refs/heads/master
Commit: 5c88d9ca43fa96afdfbed37a54b5c7bbe7d541d8
Parents: 8154346
Author: Nikolay Sokolov
Authored: Sat Sep 22 21:46:32 2018 +0800
Committer: William Guo
Committed: Sat Sep 22 21:46:32 2018 +0800
--
.travis.yml | 2 +-
.../metastore/hive/HiveMetaStoreService.java| 2 +
.../hive/HiveMetaStoreServiceImpl.java | 20 +++---
.../hive/HiveMetaStoreServiceImplTest.java | 73 ++--
4 files changed, 83 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/5c88d9ca/.travis.yml
--
diff --git a/.travis.yml b/.travis.yml
index 143b665..713b27e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,4 +24,4 @@ node_js:
install:
- npm install -g bower
-script: mvn clean verify -q
+script: travis_wait mvn clean verify -q
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/5c88d9ca/service/src/main/java/org/apache/griffin/core/metastore/hive/HiveMetaStoreService.java
--
diff --git
a/service/src/main/java/org/apache/griffin/core/metastore/hive/HiveMetaStoreService.java
b/service/src/main/java/org/apache/griffin/core/metastore/hive/HiveMetaStoreService.java
index 1dcea1b..4ef7690 100644
---
a/service/src/main/java/org/apache/griffin/core/metastore/hive/HiveMetaStoreService.java
+++
b/service/src/main/java/org/apache/griffin/core/metastore/hive/HiveMetaStoreService.java
@@ -35,4 +35,6 @@ public interface HiveMetaStoreService {
Map> getAllTable();
Table getTable(String dbName, String tableName);
+
+void evictHiveCache();
}
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/5c88d9ca/service/src/main/java/org/apache/griffin/core/metastore/hive/HiveMetaStoreServiceImpl.java
--
diff --git
a/service/src/main/java/org/apache/griffin/core/metastore/hive/HiveMetaStoreServiceImpl.java
b/service/src/main/java/org/apache/griffin/core/metastore/hive/HiveMetaStoreServiceImpl.java
index 2ec62c8..f5014e7 100644
---
a/service/src/main/java/org/apache/griffin/core/metastore/hive/HiveMetaStoreServiceImpl.java
+++
b/service/src/main/java/org/apache/griffin/core/metastore/hive/HiveMetaStoreServiceImpl.java
@@ -56,7 +56,7 @@ public class HiveMetaStoreServiceImpl implements
HiveMetaStoreService {
}
@Override
-@Cacheable
+@Cacheable(unless = "#result==null")
public Iterable getAllDatabases() {
Iterable results = null;
try {
@@ -75,7 +75,7 @@ public class HiveMetaStoreServiceImpl implements
HiveMetaStoreService {
@Override
-@Cacheable
+@Cacheable(unless = "#result==null")
public Iterable getAllTableNames(String dbName) {
Iterable results = null;
try {
@@ -88,20 +88,21 @@ public class HiveMetaStoreServiceImpl implements
HiveMetaStoreService {
} catch (Exception e) {
reconnect();
LOGGER.error("Exception fetching tables info: {}", e);
+return null;
}
return results;
}
@Override
-@Cacheable
+@Cacheable(unless = "#result==null || #result.isEmpty()")
public List getAllTable(String db) {
return getTables(db);
}
@Override
-@Cacheable
+@Cacheable(unless = "#result==null")
public Map> getAllTable() {
Map> results = new HashMap<>();
Iterable dbs;
@@ -116,6 +117,8 @@ public class HiveMetaStoreServiceImpl implements
HiveMetaStoreService {
return results;
}
for (String db : dbs) {
+// TODO: getAllTable() is not reusing caches of getAllTable(db)
and vise versa
+// TODO: getTables() can return empty values on metastore exception
results.put(db, getTables(db));
}
return results;
@@ -123,7 +126,7 @@ public class HiveM
incubator-griffin-site git commit: Updated asf-site site from master (ea98023422ad9f3e8c2ea7528f661cede97f26c8)
Repository: incubator-griffin-site Updated Branches: refs/heads/asf-site 2d927ab02 -> ca28fc3af Updated asf-site site from master (ea98023422ad9f3e8c2ea7528f661cede97f26c8) Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/commit/ca28fc3a Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/tree/ca28fc3a Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/diff/ca28fc3a Branch: refs/heads/asf-site Commit: ca28fc3affbf242cd5d8828515b3cacbcbd155b0 Parents: 2d927ab Author: William Guo Authored: Sat Sep 22 08:34:51 2018 +0800 Committer: William Guo Committed: Sat Sep 22 08:34:51 2018 +0800 -- docs/community.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/ca28fc3a/docs/community.html -- diff --git a/docs/community.html b/docs/community.html index 13d6a86..5974c34 100644 --- a/docs/community.html +++ b/docs/community.html @@ -269,7 +269,7 @@ under the License. Henry Saputra hsaputra hsaputra - Â + ASF Mentor
incubator-griffin-site git commit: update community
Repository: incubator-griffin-site Updated Branches: refs/heads/master dfdeb42f4 -> ea9802342 update community Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/commit/ea980234 Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/tree/ea980234 Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/diff/ea980234 Branch: refs/heads/master Commit: ea98023422ad9f3e8c2ea7528f661cede97f26c8 Parents: dfdeb42 Author: William Guo Authored: Sat Sep 22 08:34:11 2018 +0800 Committer: William Guo Committed: Sat Sep 22 08:34:11 2018 +0800 -- community.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/ea980234/community.md -- diff --git a/community.md b/community.md index 4e76959..af3dc8e 100644 --- a/community.md +++ b/community.md @@ -29,7 +29,7 @@ permalink: /docs/community.html | Eugene Liu | liujin | toyboxman | VMWARE | Committer | | Grant | xuexu | grant-xuexu | Ontario Institute for Cancer Research | Committer | | He Wang | wanghe | whhe | ç½æ | Committer | -| Henry Saputra | hsaputra | hsaputra | | Mentor | +| Henry Saputra | hsaputra | hsaputra | ASF | Mentor | | Jason Liao | jasonliao | jasonliaoxiaoge | å¹³å®é¶è¡ | Committer | | John Liu | johnliu | john-liu | eBay | PPMC | | Juan Li | icesmartjuan | icesmartjuan | eBay | Committer |
incubator-griffin git commit: Make Rule table MySQL-compatible
Repository: incubator-griffin
Updated Branches:
refs/heads/master b6c6c9644 -> 8154346f6
Make Rule table MySQL-compatible
OUT is reserved word in MySQL, so it should be quoted in queries.
Author: Nikolay Sokolov
Closes #418 from chemikadze/fix-mysql.
Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/8154346f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/8154346f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/8154346f
Branch: refs/heads/master
Commit: 8154346f652d4866b0cc4d54c60da8631a4b
Parents: b6c6c96
Author: Nikolay Sokolov
Authored: Fri Sep 21 10:31:23 2018 +0800
Committer: William Guo
Committed: Fri Sep 21 10:31:23 2018 +0800
--
.../src/main/java/org/apache/griffin/core/measure/entity/Rule.java | 1 +
1 file changed, 1 insertion(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/8154346f/service/src/main/java/org/apache/griffin/core/measure/entity/Rule.java
--
diff --git
a/service/src/main/java/org/apache/griffin/core/measure/entity/Rule.java
b/service/src/main/java/org/apache/griffin/core/measure/entity/Rule.java
index 5310c32..071243a 100644
--- a/service/src/main/java/org/apache/griffin/core/measure/entity/Rule.java
+++ b/service/src/main/java/org/apache/griffin/core/measure/entity/Rule.java
@@ -78,6 +78,7 @@ public class Rule extends AbstractAuditableEntity {
private List> outList;
@JsonIgnore
+@Column(name = "\"out\"")
private String out;
@JsonProperty("dsl.type")
incubator-griffin-site git commit: Updated asf-site site from master (dfdeb42f4d9b8a02d07ac1259f4709e7cdedab5a)
Repository: incubator-griffin-site Updated Branches: refs/heads/asf-site ce244d5b5 -> 2d927ab02 Updated asf-site site from master (dfdeb42f4d9b8a02d07ac1259f4709e7cdedab5a) Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/commit/2d927ab0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/tree/2d927ab0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/diff/2d927ab0 Branch: refs/heads/asf-site Commit: 2d927ab02513e136e862f177dfff6fb59794de0a Parents: ce244d5 Author: William Guo Authored: Fri Sep 21 09:49:01 2018 +0800 Committer: William Guo Committed: Fri Sep 21 09:49:01 2018 +0800 -- docs/download.html | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/2d927ab0/docs/download.html -- diff --git a/docs/download.html b/docs/download.html index 552c504..62bd562 100644 --- a/docs/download.html +++ b/docs/download.html @@ -208,9 +208,9 @@ under the License. Source download: - https://dist.apache.org/repos/dist/dev/incubator/griffin/0.1.5-incubating/griffin-parent-0.1.5-incubating-source-release.zip";>griffin-parent-0.1.5-incubating-source-release.zip - https://dist.apache.org/repos/dist/dev/incubator/griffin/0.1.5-incubating/griffin-parent-0.1.5-incubating-source-release.zip.sha1";>griffin-parent-0.1.5-incubating-source-release.zip.sha1 - https://dist.apache.org/repos/dist/dev/incubator/griffin/0.1.5-incubating/griffin-parent-0.1.5-incubating-source-release.zip.asc";>griffin-parent-0.1.5-incubating-source-release.zip.asc + https://dist.apache.org/repos/dist/dev/incubator/griffin/0.1.5-incubating/griffin-parent-0.1.5-incubating-source-release.zip";>griffin-0.1.5-incubating-source-release.zip + https://dist.apache.org/repos/dist/dev/incubator/griffin/0.1.5-incubating/griffin-parent-0.1.5-incubating-source-release.zip.sha1";>griffin-0.1.5-incubating-source-release.zip.sha1 + https://dist.apache.org/repos/dist/dev/incubator/griffin/0.1.5-incubating/griffin-parent-0.1.5-incubating-source-release.zip.asc";>griffin-0.1.5-incubating-source-release.zip.asc Git revision: @@ -229,9 +229,9 @@ under the License. Source download: - https://dist.apache.org/repos/dist/dev/incubator/griffin/0.1.4-incubating/griffin-parent-0.1.4-incubating-source-release.zip";>griffin-parent-0.1.4-incubating-source-release.zip - https://dist.apache.org/repos/dist/dev/incubator/griffin/0.1.4-incubating/griffin-parent-0.1.4-incubating-source-release.zip.sha1";>griffin-parent-0.1.4-incubating-source-release.zip.sha1 - https://dist.apache.org/repos/dist/dev/incubator/griffin/0.1.4-incubating/griffin-parent-0.1.4-incubating-source-release.zip.asc";>griffin-parent-0.1.4-incubating-source-release.zip.asc + https://dist.apache.org/repos/dist/dev/incubator/griffin/0.1.4-incubating/griffin-0.1.4-incubating-source-release.zip";>griffin-0.1.4-incubating-source-release.zip + https://dist.apache.org/repos/dist/dev/incubator/griffin/0.1.4-incubating/griffin-0.1.4-incubating-source-release.zip.sha1";>griffin-0.1.4-incubating-source-release.zip.sha1 + https://dist.apache.org/repos/dist/dev/incubator/griffin/0.1.4-incubating/griffin-0.1.4-incubating-source-release.zip.asc";>griffin-0.1.4-incubating-source-release.zip.asc Git revision:
incubator-griffin-site git commit: make versions consistent
Repository: incubator-griffin-site Updated Branches: refs/heads/master 4af645816 -> dfdeb42f4 make versions consistent Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/commit/dfdeb42f Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/tree/dfdeb42f Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/diff/dfdeb42f Branch: refs/heads/master Commit: dfdeb42f4d9b8a02d07ac1259f4709e7cdedab5a Parents: 4af6458 Author: William Guo Authored: Fri Sep 21 09:48:39 2018 +0800 Committer: William Guo Committed: Fri Sep 21 09:48:39 2018 +0800 -- download.md | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/dfdeb42f/download.md -- diff --git a/download.md b/download.md index b399e7b..e8e42a5 100644 --- a/download.md +++ b/download.md @@ -43,9 +43,9 @@ permalink: /docs/download.html * Release notes: * [griffin 0.1.5 Release Notes](https://dist.apache.org/repos/dist/dev/incubator/griffin/0.1.5-incubating/CHANGES.txt) * Source download: - * [griffin-parent-0.1.5-incubating-source-release.zip](https://dist.apache.org/repos/dist/dev/incubator/griffin/0.1.5-incubating/griffin-parent-0.1.5-incubating-source-release.zip) - * [griffin-parent-0.1.5-incubating-source-release.zip.sha1](https://dist.apache.org/repos/dist/dev/incubator/griffin/0.1.5-incubating/griffin-parent-0.1.5-incubating-source-release.zip.sha1) - * [griffin-parent-0.1.5-incubating-source-release.zip.asc](https://dist.apache.org/repos/dist/dev/incubator/griffin/0.1.5-incubating/griffin-parent-0.1.5-incubating-source-release.zip.asc) + * [griffin-0.1.5-incubating-source-release.zip](https://dist.apache.org/repos/dist/dev/incubator/griffin/0.1.5-incubating/griffin-parent-0.1.5-incubating-source-release.zip) + * [griffin-0.1.5-incubating-source-release.zip.sha1](https://dist.apache.org/repos/dist/dev/incubator/griffin/0.1.5-incubating/griffin-parent-0.1.5-incubating-source-release.zip.sha1) + * [griffin-0.1.5-incubating-source-release.zip.asc](https://dist.apache.org/repos/dist/dev/incubator/griffin/0.1.5-incubating/griffin-parent-0.1.5-incubating-source-release.zip.asc) * Git revision: * tag: [griffin-0.1.5-incubating](https://git-wip-us.apache.org/repos/asf?p=incubator-griffin.git;a=tag;h=refs/tags/griffin-0.1.5-incubating) @@ -53,8 +53,8 @@ permalink: /docs/download.html * Release notes: * [griffin 0.1.4 Release Notes](https://dist.apache.org/repos/dist/dev/incubator/griffin/0.1.4-incubating/CHANGES.txt) * Source download: - * [griffin-parent-0.1.4-incubating-source-release.zip](https://dist.apache.org/repos/dist/dev/incubator/griffin/0.1.4-incubating/griffin-parent-0.1.4-incubating-source-release.zip) - * [griffin-parent-0.1.4-incubating-source-release.zip.sha1](https://dist.apache.org/repos/dist/dev/incubator/griffin/0.1.4-incubating/griffin-parent-0.1.4-incubating-source-release.zip.sha1) - * [griffin-parent-0.1.4-incubating-source-release.zip.asc](https://dist.apache.org/repos/dist/dev/incubator/griffin/0.1.4-incubating/griffin-parent-0.1.4-incubating-source-release.zip.asc) + * [griffin-0.1.4-incubating-source-release.zip](https://dist.apache.org/repos/dist/dev/incubator/griffin/0.1.4-incubating/griffin-0.1.4-incubating-source-release.zip) + * [griffin-0.1.4-incubating-source-release.zip.sha1](https://dist.apache.org/repos/dist/dev/incubator/griffin/0.1.4-incubating/griffin-0.1.4-incubating-source-release.zip.sha1) + * [griffin-0.1.4-incubating-source-release.zip.asc](https://dist.apache.org/repos/dist/dev/incubator/griffin/0.1.4-incubating/griffin-0.1.4-incubating-source-release.zip.asc) * Git revision: * tag: [griffin-0.1.4-incubating](https://git-wip-us.apache.org/repos/asf?p=incubator-griffin.git;a=tag;h=refs/tags/griffin-0.1.4-incubating)
incubator-griffin-site git commit: Updated asf-site site from master (4af64581614fb026fdb02b34ba57b0b4a053765a)
Repository: incubator-griffin-site Updated Branches: refs/heads/asf-site 269bb3f7d -> ce244d5b5 Updated asf-site site from master (4af64581614fb026fdb02b34ba57b0b4a053765a) Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/commit/ce244d5b Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/tree/ce244d5b Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/diff/ce244d5b Branch: refs/heads/asf-site Commit: ce244d5b53159c7b84440e611cf197b302a2af5b Parents: 269bb3f Author: William Guo Authored: Fri Sep 21 09:43:22 2018 +0800 Committer: William Guo Committed: Fri Sep 21 09:43:22 2018 +0800 -- docs/download.html | 16 1 file changed, 8 insertions(+), 8 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/ce244d5b/docs/download.html -- diff --git a/docs/download.html b/docs/download.html index b64d562..552c504 100644 --- a/docs/download.html +++ b/docs/download.html @@ -167,7 +167,7 @@ under the License. Source download: https://dist.apache.org/repos/dist/dev/incubator/griffin/0.2.0-incubating/griffin-0.2.0-incubating-source-release.zip";>griffin-0.2.0-incubating-source-release.zip - https://dist.apache.org/repos/dist/dev/incubator/griffin/0.2.0-incubating/griffin-0.2.0-incubating-source-release.zip.sha512";>griffin-0.2.0-incubating-source-release.zip.sha512 + https://dist.apache.org/repos/dist/dev/incubator/griffin/0.2.0-incubating/griffin-0.2.0-incubating-source-release.zip.sha1";>griffin-0.2.0-incubating-source-release.zip.sha1 https://dist.apache.org/repos/dist/dev/incubator/griffin/0.2.0-incubating/griffin-0.2.0-incubating-source-release.zip.asc";>griffin-0.2.0-incubating-source-release.zip.asc @@ -188,7 +188,7 @@ under the License. Source download: https://dist.apache.org/repos/dist/dev/incubator/griffin/0.1.6-incubating/griffin-0.1.6-incubating-source-release.zip";>griffin-0.1.6-incubating-source-release.zip - https://dist.apache.org/repos/dist/dev/incubator/griffin/0.1.6-incubating/griffin-0.1.6-incubating-source-release.zip.sha512";>griffin-0.1.6-incubating-source-release.zip.sha512 + https://dist.apache.org/repos/dist/dev/incubator/griffin/0.1.6-incubating/griffin-0.1.6-incubating-source-release.zip.sha1";>griffin-0.1.6-incubating-source-release.zip.sha1 https://dist.apache.org/repos/dist/dev/incubator/griffin/0.1.6-incubating/griffin-0.1.6-incubating-source-release.zip.asc";>griffin-0.1.6-incubating-source-release.zip.asc @@ -208,9 +208,9 @@ under the License. Source download: - https://dist.apache.org/repos/dist/dev/incubator/griffin/0.1.5-incubating/griffin-0.1.5-incubating-source-release.zip";>griffin-0.1.5-incubating-source-release.zip - https://dist.apache.org/repos/dist/dev/incubator/griffin/0.1.5-incubating/griffin-0.1.5-incubating-source-release.zip.sha512";>griffin-0.1.5-incubating-source-release.zip.sha512 - https://dist.apache.org/repos/dist/dev/incubator/griffin/0.1.5-incubating/griffin-0.1.5-incubating-source-release.zip.asc";>griffin-0.1.5-incubating-source-release.zip.asc + https://dist.apache.org/repos/dist/dev/incubator/griffin/0.1.5-incubating/griffin-parent-0.1.5-incubating-source-release.zip";>griffin-parent-0.1.5-incubating-source-release.zip + https://dist.apache.org/repos/dist/dev/incubator/griffin/0.1.5-incubating/griffin-parent-0.1.5-incubating-source-release.zip.sha1";>griffin-parent-0.1.5-incubating-source-release.zip.sha1 + https://dist.apache.org/repos/dist/dev/incubator/griffin/0.1.5-incubating/griffin-parent-0.1.5-incubating-source-release.zip.asc";>griffin-parent-0.1.5-incubating-source-release.zip.asc Git revision: @@ -229,9 +229,9 @@ under the License. Source download: - https://dist.apache.org/repos/dist/dev/incubator/griffin/0.1.4-incubating/griffin-0.1.4-incubating-source-release.zip";>griffin-0.1.4-incubating-source-release.zip - https://dist.apache.org/repos/dist/dev/incubator/griffin/0.1.4-incubating/griffin-0.1.4-incubating-source-release.zip.sha512";>griffin-0.1.4-incubating-source-release.zip.sha512 - https://dist.apache.org/repos/dist/dev/incubator/griffin/0.1.4-incubating/griffin-0.1.4-incubating-source-release.zip.asc";>griffin-0.1.4-incubating-source-release.zip.asc + https://dist.apache.org/repos/dist/dev/incubator/griffin/0.1.4-incubating/griffin-parent-0.1.4-incubating-source-release.zip";>griffin-parent-0.1.4-incubating-source-release.zip + https://dist.apache.org/repos/dist/dev/incubator/griffin/0.1.4-incubating/griffin-parent-0.1.4-incubating-source-release.zip.sha1";>griffin-parent-0.1.
incubator-griffin-site git commit: fix wrong links
Repository: incubator-griffin-site Updated Branches: refs/heads/master 4d6cfb444 -> 4af645816 fix wrong links Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/commit/4af64581 Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/tree/4af64581 Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/diff/4af64581 Branch: refs/heads/master Commit: 4af64581614fb026fdb02b34ba57b0b4a053765a Parents: 4d6cfb4 Author: William Guo Authored: Fri Sep 21 09:42:42 2018 +0800 Committer: William Guo Committed: Fri Sep 21 09:42:42 2018 +0800 -- download.md | 16 1 file changed, 8 insertions(+), 8 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/4af64581/download.md -- diff --git a/download.md b/download.md index 72c9a17..b399e7b 100644 --- a/download.md +++ b/download.md @@ -24,7 +24,7 @@ permalink: /docs/download.html * [griffin 0.2.0 Release Notes](https://dist.apache.org/repos/dist/dev/incubator/griffin/0.2.0-incubating/CHANGES.txt) * Source download: * [griffin-0.2.0-incubating-source-release.zip](https://dist.apache.org/repos/dist/dev/incubator/griffin/0.2.0-incubating/griffin-0.2.0-incubating-source-release.zip) - * [griffin-0.2.0-incubating-source-release.zip.sha512](https://dist.apache.org/repos/dist/dev/incubator/griffin/0.2.0-incubating/griffin-0.2.0-incubating-source-release.zip.sha512) + * [griffin-0.2.0-incubating-source-release.zip.sha1](https://dist.apache.org/repos/dist/dev/incubator/griffin/0.2.0-incubating/griffin-0.2.0-incubating-source-release.zip.sha1) * [griffin-0.2.0-incubating-source-release.zip.asc](https://dist.apache.org/repos/dist/dev/incubator/griffin/0.2.0-incubating/griffin-0.2.0-incubating-source-release.zip.asc) * Git revision: * tag: [griffin-0.2.0-incubating](https://git-wip-us.apache.org/repos/asf?p=incubator-griffin.git;a=tag;h=refs/tags/griffin-0.2.0-incubating) @@ -34,7 +34,7 @@ permalink: /docs/download.html * [griffin 0.1.6 Release Notes](https://dist.apache.org/repos/dist/dev/incubator/griffin/0.1.6-incubating/CHANGES.txt) * Source download: * [griffin-0.1.6-incubating-source-release.zip](https://dist.apache.org/repos/dist/dev/incubator/griffin/0.1.6-incubating/griffin-0.1.6-incubating-source-release.zip) - * [griffin-0.1.6-incubating-source-release.zip.sha512](https://dist.apache.org/repos/dist/dev/incubator/griffin/0.1.6-incubating/griffin-0.1.6-incubating-source-release.zip.sha512) + * [griffin-0.1.6-incubating-source-release.zip.sha1](https://dist.apache.org/repos/dist/dev/incubator/griffin/0.1.6-incubating/griffin-0.1.6-incubating-source-release.zip.sha1) * [griffin-0.1.6-incubating-source-release.zip.asc](https://dist.apache.org/repos/dist/dev/incubator/griffin/0.1.6-incubating/griffin-0.1.6-incubating-source-release.zip.asc) * Git revision: * tag: [griffin-0.1.6-incubating](https://git-wip-us.apache.org/repos/asf?p=incubator-griffin.git;a=tag;h=refs/tags/griffin-0.1.6-incubating) @@ -43,9 +43,9 @@ permalink: /docs/download.html * Release notes: * [griffin 0.1.5 Release Notes](https://dist.apache.org/repos/dist/dev/incubator/griffin/0.1.5-incubating/CHANGES.txt) * Source download: - * [griffin-0.1.5-incubating-source-release.zip](https://dist.apache.org/repos/dist/dev/incubator/griffin/0.1.5-incubating/griffin-0.1.5-incubating-source-release.zip) - * [griffin-0.1.5-incubating-source-release.zip.sha512](https://dist.apache.org/repos/dist/dev/incubator/griffin/0.1.5-incubating/griffin-0.1.5-incubating-source-release.zip.sha512) - * [griffin-0.1.5-incubating-source-release.zip.asc](https://dist.apache.org/repos/dist/dev/incubator/griffin/0.1.5-incubating/griffin-0.1.5-incubating-source-release.zip.asc) + * [griffin-parent-0.1.5-incubating-source-release.zip](https://dist.apache.org/repos/dist/dev/incubator/griffin/0.1.5-incubating/griffin-parent-0.1.5-incubating-source-release.zip) + * [griffin-parent-0.1.5-incubating-source-release.zip.sha1](https://dist.apache.org/repos/dist/dev/incubator/griffin/0.1.5-incubating/griffin-parent-0.1.5-incubating-source-release.zip.sha1) + * [griffin-parent-0.1.5-incubating-source-release.zip.asc](https://dist.apache.org/repos/dist/dev/incubator/griffin/0.1.5-incubating/griffin-parent-0.1.5-incubating-source-release.zip.asc) * Git revision: * tag: [griffin-0.1.5-incubating](https://git-wip-us.apache.org/repos/asf?p=incubator-griffin.git;a=tag;h=refs/tags/griffin-0.1.5-incubating) @@ -53,8 +53,8 @@ permalink: /docs/download.html * Release notes: * [griffin 0.1.4 Release Notes](http
incubator-griffin-site git commit: Updated asf-site site from master (4d6cfb44402863ef207cf58c39e5732196320175)
Repository: incubator-griffin-site Updated Branches: refs/heads/asf-site a81ec480f -> 269bb3f7d Updated asf-site site from master (4d6cfb44402863ef207cf58c39e5732196320175) Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/commit/269bb3f7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/tree/269bb3f7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/diff/269bb3f7 Branch: refs/heads/asf-site Commit: 269bb3f7d30956a8bd5632eae3e8d19706bbe2f5 Parents: a81ec48 Author: William Guo Authored: Fri Sep 21 09:20:51 2018 +0800 Committer: William Guo Committed: Fri Sep 21 09:20:51 2018 +0800 -- index.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/269bb3f7/index.html -- diff --git a/index.html b/index.html index 25bad84..ae46efb 100755 --- a/index.html +++ b/index.html @@ -70,8 +70,7 @@ ABOUT ARCHITECTURE COMMUNITY -DOCS +DOCS
incubator-griffin-site git commit: add docs link
Repository: incubator-griffin-site Updated Branches: refs/heads/master 1e29d1a3f -> 4d6cfb444 add docs link Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/commit/4d6cfb44 Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/tree/4d6cfb44 Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/diff/4d6cfb44 Branch: refs/heads/master Commit: 4d6cfb44402863ef207cf58c39e5732196320175 Parents: 1e29d1a Author: William Guo Authored: Fri Sep 21 09:20:22 2018 +0800 Committer: William Guo Committed: Fri Sep 21 09:20:22 2018 +0800 -- index.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/4d6cfb44/index.html -- diff --git a/index.html b/index.html index 25bad84..ae46efb 100755 --- a/index.html +++ b/index.html @@ -70,8 +70,7 @@ ABOUT ARCHITECTURE COMMUNITY -DOCS +DOCS
incubator-griffin-site git commit: Updated asf-site site from master (1e29d1a3fda89b51e8fb21e2d0c9de1bf3d60825)
Repository: incubator-griffin-site Updated Branches: refs/heads/asf-site 13c9b42f6 -> a81ec480f Updated asf-site site from master (1e29d1a3fda89b51e8fb21e2d0c9de1bf3d60825) Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/commit/a81ec480 Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/tree/a81ec480 Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/diff/a81ec480 Branch: refs/heads/asf-site Commit: a81ec480ff46c2e35eeace4e68583f24b42bf904 Parents: 13c9b42 Author: William Guo Authored: Fri Sep 21 09:19:09 2018 +0800 Committer: William Guo Committed: Fri Sep 21 09:19:09 2018 +0800 -- docs/community.html| 130 +- docs/conf.html | 2 + docs/contribute.html | 2 + docs/contributors.html | 317 docs/download.html | 2 + docs/latest.html | 2 + docs/profiling.html| 2 + docs/quickstart.html | 2 + docs/usecases.html | 2 + index.html | 7 +- 10 files changed, 337 insertions(+), 131 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/a81ec480/docs/community.html -- diff --git a/docs/community.html b/docs/community.html index 26d8c49..13d6a86 100644 --- a/docs/community.html +++ b/docs/community.html @@ -111,6 +111,8 @@ under the License. Contribution + Contributors + Download @@ -215,7 +217,7 @@ under the License. Issue Tracker https://issues.apache.org/jira/browse/griffin";>https://issues.apache.org/jira/browse/griffin -Team Members +Griffin PPMC And Committers @@ -243,20 +245,6 @@ under the License. PPMC - Chen Xiangrong -  - justACT - Paypal - Contributor - - - edwardhupeng -  - EdwardHoot - Alipay - Contributor - - Eugene Liu liujin toyboxman @@ -264,20 +252,6 @@ under the License. Committer - Evan Wan -  - evanwan87 - eBay - Contributor - - - forshareIT -  - forshareIT -  - Contributor - - Grant xuexu grant-xuexu @@ -327,13 +301,6 @@ under the License. Mentor - Kwang-in (Dennis) Jung -  - djKooks -  - Contributor - - Liang Shao liangshao liangshao @@ -348,13 +315,6 @@ under the License. PPMC - Louise Lu -  - ludongfang - eBay - Contributor - - Luciano Resende lresende lresende @@ -362,41 +322,6 @@ under the License. Mentor - MintL617 -  - MintL617 -  - Contributor - - - Nikolay -  - chemikadze - Grid Dynamics - Contributor - - - Pan Feng -  - panffeng - eBay - Contributor - - - RachelYang2 -  - RachelYang2 - ä¾å¾ - Contributor - - - Scott Ding -  - dingminyi - eBay - Contributor - - Shawn Sha yosha yosha1 @@ -404,20 +329,6 @@ under the License. PPMC - Sparsh Singhal -  - SparshSinghalHM - Hashmap Tech India Limited - Contributor - - - Spencer Hivert -  - spencer-hivert-ck - Credit Karma - Contributor - - Uma Maheswara Rao Gangumalla umamahesh  @@ -439,47 +350,12 @@ under the License. PPMC - YiliaZhang -  - Yilia05 - USTC - Contributor - - - Yiye Fang -  - yiyef -  - Contributor - - - younglee1 -  - younglee1 -  - Contributor - - Yuqin Xuan xuanyq dodobel å为 Committer - - zornlemma -  - zhou7yuan###gmail%%%com - eBay - Contributor - - - 诸èåæ¿ -  - xiaoqiu-duan - å¯åä¼ - Contributor - http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/a81ec480/docs/conf.html -- diff --git a/docs/conf.html b/docs/conf.html index 61c18f8..c7b1860 100644 --- a/docs/conf.html +++ b/docs/conf.html @@ -111,6 +111,8 @@ under the License. Contribution + Contributors + Download http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/a81e
incubator-griffin-site git commit: separate contributors from committers
Repository: incubator-griffin-site Updated Branches: refs/heads/master 65142936c -> 1e29d1a3f separate contributors from committers Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/commit/1e29d1a3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/tree/1e29d1a3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/diff/1e29d1a3 Branch: refs/heads/master Commit: 1e29d1a3fda89b51e8fb21e2d0c9de1bf3d60825 Parents: 6514293 Author: William Guo Authored: Fri Sep 21 09:18:30 2018 +0800 Committer: William Guo Committed: Fri Sep 21 09:18:30 2018 +0800 -- _config.yml | 2 ++ community.md| 20 +--- contributors.md | 27 +++ index.html | 7 +++ 4 files changed, 33 insertions(+), 23 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/1e29d1a3/_config.yml -- diff --git a/_config.yml b/_config.yml index 102f984..a937796 100644 --- a/_config.yml +++ b/_config.yml @@ -47,6 +47,8 @@ documentations: links: - title: Contribution url: /docs/contribute.html + - title: Contributors +url: /docs/contributors.html - category: Download links: - title: Latest version (v0.3.0) http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/1e29d1a3/community.md -- diff --git a/community.md b/community.md index 84d2c7d..4e76959 100644 --- a/community.md +++ b/community.md @@ -20,17 +20,13 @@ permalink: /docs/community.html -### Team Members +### Griffin PPMC And Committers | Name | Apacheid | Githubid | Org | Role | |--|--|-|---|-| | ahutsunshine | dyyao | ahutsunshine | ç¾å¢ | Committer | | Alex Lv | alexlv | alexatapache | eBay | PPMC | -| Chen Xiangrong | | justACT | Paypal | Contributor | -| edwardhupeng | | EdwardHoot | Alipay | Contributor | | Eugene Liu | liujin | toyboxman | VMWARE | Committer | -| Evan Wan | | evanwan87 | eBay | Contributor | -| forshareIT | | forshareIT | | Contributor | | Grant | xuexu | grant-xuexu | Ontario Institute for Cancer Research | Committer | | He Wang | wanghe | whhe | ç½æ | Committer | | Henry Saputra | hsaputra | hsaputra | | Mentor | @@ -38,27 +34,13 @@ permalink: /docs/community.html | John Liu | johnliu | john-liu | eBay | PPMC | | Juan Li | icesmartjuan | icesmartjuan | eBay | Committer | | Kasper Sørensen | kaspersor | kaspersorensen | Satori Software | Mentor | -| Kwang-in (Dennis) Jung | | djKooks | | Contributor | | Liang Shao | liangshao | liangshao | eBay | PPMC | | Lionel Liu | lionelliu | bhlx3lyx7 | eBay | PPMC | -| Louise Lu | | ludongfang | eBay | Contributor | | Luciano Resende | lresende | lresende | IBM | Mentor | -| MintL617 | | MintL617 | | Contributor | -| Nikolay | | chemikadze | Grid Dynamics | Contributor | -| Pan Feng | | panffeng | eBay | Contributor | -| RachelYang2 | | RachelYang2 | ä¾å¾ | Contributor | -| Scott Ding | | dingminyi | eBay | Contributor | | Shawn Sha | yosha | yosha1 | äº¬ä¸ | PPMC | -| Sparsh Singhal | | SparshSinghalHM | Hashmap Tech India Limited | Contributor | -| Spencer Hivert | | spencer-hivert-ck | Credit Karma | Contributor | | Uma Maheswara Rao Gangumalla | umamahesh | | IBM | Mentor | | Vincent Zhao | wenzhao | vzhao | eBay | PPMC | | William Guo | guoyp | guoyuepeng | eBay | PPMC | -| YiliaZhang | | Yilia05 | USTC | Contributor | -| Yiye Fang | | yiyef | | Contributor | -| younglee1 | | younglee1 | | Contributor | | Yuqin Xuan | xuanyq | dodobel | å为 | Committer | -| zornlemma | | zhou7yuan###gmail%%%com | eBay | Contributor | -| 诸èåæ¿ | | xiaoqiu-duan | å¯åä¼ | Contributor | http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/1e29d1a3/contributors.md -- diff --git a/contributors.md b/contributors.md new file mode 100644 index 000..268ea49 --- /dev/null +++ b/contributors.md @@ -0,0 +1,27 @@ +--- +layout: doc +title: "Griffin Contributors" +permalink: /docs/contributors.html +--- + +| Name | Apacheid | Githubid | Org | Role | +|--|--|-|---|-| +| Chen Xiangrong | | justACT | Paypal | Contributor | +| edwardhupeng | | EdwardHoot | Alipay | Contributor | +| Evan Wan | | evanwan87 | eBay | Contributor | +| forshareIT | | forshareIT | | Contributor | +| He Wang | wanghe | whhe | ç½æ
incubator-griffin git commit: Deployment and compose doc improvements
Repository: incubator-griffin
Updated Branches:
refs/heads/master 887ea3389 -> b6c6c9644
Deployment and compose doc improvements
Author: Nikolay Sokolov
Closes #417 from chemikadze/deployment-documentation.
Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/b6c6c964
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/b6c6c964
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/b6c6c964
Branch: refs/heads/master
Commit: b6c6c96449cc7d26cfaab45c082790393a1a57ba
Parents: 887ea33
Author: Nikolay Sokolov
Authored: Thu Sep 20 14:08:30 2018 +0800
Committer: William Guo
Committed: Thu Sep 20 14:08:30 2018 +0800
--
griffin-doc/deploy/deploy-guide.md | 41
.../docker/compose/docker-compose-batch.yml | 14 +++
2 files changed, 48 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/b6c6c964/griffin-doc/deploy/deploy-guide.md
--
diff --git a/griffin-doc/deploy/deploy-guide.md
b/griffin-doc/deploy/deploy-guide.md
index a12db2e..b2f3536 100644
--- a/griffin-doc/deploy/deploy-guide.md
+++ b/griffin-doc/deploy/deploy-guide.md
@@ -64,6 +64,40 @@ Init quartz tables in MySQL using
[Init_quartz_mysql_innodb.sql.sql](../../servi
mysql -u -p quartz < Init_quartz_mysql_innodb.sql.sql
```
+ Elasticsearch
+
+You might want to create Elasticsearch index in advance, in order to set
number of shards, replicas, and other settings to desired values:
+```
+curl -XPUT http://es:9200/griffin -d '
+{
+"aliases": {},
+"mappings": {
+"accuracy": {
+"properties": {
+"name": {
+"fields": {
+"keyword": {
+"ignore_above": 256,
+"type": "keyword"
+}
+},
+"type": "text"
+},
+"tmst": {
+"type": "long"
+}
+}
+}
+},
+"settings": {
+"index": {
+"number_of_replicas": "1",
+"number_of_shards": "5"
+}
+}
+}
+'
+```
You should also modify some configurations of Griffin for your environment.
@@ -135,6 +169,13 @@ You should also modify some configurations of Griffin for
your environment.
```
- \ is the location where you should put the jar
file of measure module.
+
+- service/src/main/resources/env/env_batch.json
+
+Adjust sinks according to your requirement. At least, you will need to
adjust HDFS output
+directory (hdfs:///griffin/persist by default), and Elasticsearch URL
(http://es:9200/griffin/accuracy by default).
+Similar changes are required in `env_streaming.json`.
+
### Build and Run
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/b6c6c964/griffin-doc/docker/compose/docker-compose-batch.yml
--
diff --git a/griffin-doc/docker/compose/docker-compose-batch.yml
b/griffin-doc/docker/compose/docker-compose-batch.yml
index 592be52..bd993d7 100644
--- a/griffin-doc/docker/compose/docker-compose-batch.yml
+++ b/griffin-doc/docker/compose/docker-compose-batch.yml
@@ -26,13 +26,13 @@ griffin:
- /var/lib/mysql
ports:
- 32122:2122
-- 38088:8088
-- 33306:3306
-- 35432:5432
-- 38042:8042
-- 39083:9083
-- 38998:8998
-- 38080:8080
+- 38088:8088 # yarn rm web ui
+- 33306:3306 # mysql
+- 35432:5432 # postgres
+- 38042:8042 # yarn nm web ui
+- 39083:9083 # hive-metastore
+- 38998:8998 # livy
+- 38080:8080 # griffin ui
tty: true
container_name: griffin
incubator-griffin git commit: Fix rest api bug in service component
Repository: incubator-griffin
Updated Branches:
refs/heads/master 33fe4c139 -> 887ea3389
Fix rest api bug in service component
GET /api/v1/version returns mistaken release version 0.2.0 instead of 0.3.0
Author: Eugene
Closes #416 from toyboxman/src/service.
Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/887ea338
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/887ea338
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/887ea338
Branch: refs/heads/master
Commit: 887ea3389ed56cab6c478a1493f0c8dda6a18b44
Parents: 33fe4c1
Author: Eugene
Authored: Thu Sep 20 13:59:18 2018 +0800
Committer: William Guo
Committed: Thu Sep 20 13:59:18 2018 +0800
--
.../java/org/apache/griffin/core/info/GriffinInfoController.java | 2 +-
.../org/apache/griffin/core/info/GriffinInfoControllerTest.java| 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/887ea338/service/src/main/java/org/apache/griffin/core/info/GriffinInfoController.java
--
diff --git
a/service/src/main/java/org/apache/griffin/core/info/GriffinInfoController.java
b/service/src/main/java/org/apache/griffin/core/info/GriffinInfoController.java
index 5c3c87a..ee0d777 100644
---
a/service/src/main/java/org/apache/griffin/core/info/GriffinInfoController.java
+++
b/service/src/main/java/org/apache/griffin/core/info/GriffinInfoController.java
@@ -29,6 +29,6 @@ public class GriffinInfoController {
@RequestMapping(value = "/version", method = RequestMethod.GET)
public String greeting() {
-return "0.2.0";
+return "0.3.0";
}
}
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/887ea338/service/src/test/java/org/apache/griffin/core/info/GriffinInfoControllerTest.java
--
diff --git
a/service/src/test/java/org/apache/griffin/core/info/GriffinInfoControllerTest.java
b/service/src/test/java/org/apache/griffin/core/info/GriffinInfoControllerTest.java
index 8ded661..d868ae3 100644
---
a/service/src/test/java/org/apache/griffin/core/info/GriffinInfoControllerTest.java
+++
b/service/src/test/java/org/apache/griffin/core/info/GriffinInfoControllerTest.java
@@ -43,6 +43,6 @@ public class GriffinInfoControllerTest {
public void testGreeting() throws Exception {
mockMvc.perform(get(URLHelper.API_VERSION_PATH + "/version"))
.andExpect(status().isOk())
-.andExpect(jsonPath("$", is("0.2.0")));
+.andExpect(jsonPath("$", is("0.3.0")));
}
}
incubator-griffin git commit: Support for HDP
Repository: incubator-griffin
Updated Branches:
refs/heads/master dcddf9689 -> 33fe4c139
Support for HDP
Added parameter for CISF protection in Ambari. Can be provided in a separate
branch.
Author: Sparsh Singhal
Closes #409 from SparshSinghalHM/patch-4.
Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/33fe4c13
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/33fe4c13
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/33fe4c13
Branch: refs/heads/master
Commit: 33fe4c139f9a48b8391b75212f710a157857e181
Parents: dcddf96
Author: Sparsh Singhal
Authored: Thu Sep 20 13:48:30 2018 +0800
Committer: William Guo
Committed: Thu Sep 20 13:48:30 2018 +0800
--
.../org/apache/griffin/core/job/SparkSubmitJob.java | 15 ---
1 file changed, 12 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/33fe4c13/service/src/main/java/org/apache/griffin/core/job/SparkSubmitJob.java
--
diff --git
a/service/src/main/java/org/apache/griffin/core/job/SparkSubmitJob.java
b/service/src/main/java/org/apache/griffin/core/job/SparkSubmitJob.java
index 64478b8..cd0e7e8 100644
--- a/service/src/main/java/org/apache/griffin/core/job/SparkSubmitJob.java
+++ b/service/src/main/java/org/apache/griffin/core/job/SparkSubmitJob.java
@@ -63,6 +63,10 @@ import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
import org.springframework.web.client.HttpClientErrorException;
import org.springframework.web.client.RestTemplate;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import static org.apache.griffin.core.util.JsonUtil.toJsonWithFormat;
@PersistJobDataAfterExecution
@DisallowConcurrentExecution
@@ -70,7 +74,7 @@ import org.springframework.web.client.RestTemplate;
public class SparkSubmitJob implements Job {
private static final Logger LOGGER =
LoggerFactory.getLogger(SparkSubmitJob.class);
-
+private static final String REQUEST_BY_HEADER = "X-Requested-By";
@Autowired
private JobInstanceRepo jobInstanceRepo;
@Autowired
@@ -113,8 +117,13 @@ public class SparkSubmitJob implements Job {
private String post2Livy() {
String result = null;
try {
-result = restTemplate.postForObject(livyUri, livyConfMap,
-String.class);
+HttpHeaders headers = new HttpHeaders();
+headers.setContentType(MediaType.APPLICATION_JSON);
+headers.set(REQUEST_BY_HEADER,"admin");
+
+HttpEntity springEntity = new
HttpEntity(toJsonWithFormat(livyConfMap), headers );
+result =
restTemplate.postForObject(livyUri,springEntity,String.class);
+
LOGGER.info(result);
} catch (HttpClientErrorException e) {
LOGGER.error("Post to livy ERROR. \n {} {}",
incubator-griffin-site git commit: Updated asf-site site from master (65142936c8633a7693174e90ca03e285afc0e445)
Repository: incubator-griffin-site Updated Branches: refs/heads/asf-site 8f47d3635 -> 13c9b42f6 Updated asf-site site from master (65142936c8633a7693174e90ca03e285afc0e445) Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/commit/13c9b42f Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/tree/13c9b42f Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/diff/13c9b42f Branch: refs/heads/asf-site Commit: 13c9b42f61de0a780efae186c00525c6ec98429c Parents: 8f47d36 Author: William Guo Authored: Wed Sep 19 16:46:28 2018 +0800 Committer: William Guo Committed: Wed Sep 19 16:46:28 2018 +0800 -- docs/community.html | 2 - docs/conf.html | 2 - docs/contribute.html | 2 - docs/download.html | 116 -- docs/latest.html | 33 +++-- docs/profiling.html | 2 - docs/quickstart.html | 2 - docs/usecases.html | 2 - 8 files changed, 139 insertions(+), 22 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/13c9b42f/docs/community.html -- diff --git a/docs/community.html b/docs/community.html index 4db2f98..26d8c49 100644 --- a/docs/community.html +++ b/docs/community.html @@ -111,8 +111,6 @@ under the License. Contribution - Latest version (v0.3.0) - Download http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/13c9b42f/docs/conf.html -- diff --git a/docs/conf.html b/docs/conf.html index 4091411..61c18f8 100644 --- a/docs/conf.html +++ b/docs/conf.html @@ -111,8 +111,6 @@ under the License. Contribution - Latest version (v0.3.0) - Download http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/13c9b42f/docs/contribute.html -- diff --git a/docs/contribute.html b/docs/contribute.html index 8df9e9c..fae3095 100644 --- a/docs/contribute.html +++ b/docs/contribute.html @@ -111,8 +111,6 @@ under the License. Contribution - Latest version (v0.3.0) - Download http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/13c9b42f/docs/download.html -- diff --git a/docs/download.html b/docs/download.html index e7cf7ed..a54e618 100644 --- a/docs/download.html +++ b/docs/download.html @@ -21,7 +21,7 @@ under the License. - Griffin - Download Apache Griffin + Griffin - Apache Griffin Latest Download @@ -111,8 +111,6 @@ under the License. Contribution - Latest version (v0.3.0) - Download @@ -129,9 +127,117 @@ under the License. -Download Apache Griffin -Download Apache Griffin +Apache Griffin Latest Download + + Version 0.3.0 is the latest release. + + You can verify your download by following these https://www.apache.org/info/verification.html";>procedures and using these https://dist.apache.org/repos/dist/dev/incubator/griffin/KEYS";>KEYS. + + +0.3.0 + + Release notes: + + https://dist.apache.org/repos/dist/dev/incubator/griffin/0.3.0-incubating/CHANGES.txt";>griffin 0.3.0 Release Notes + + + Source download: + + https://dist.apache.org/repos/dist/dev/incubator/griffin/0.3.0-incubating/griffin-0.3.0-incubating-source-release.zip";>griffin-0.3.0-incubating-source-release.zip + https://dist.apache.org/repos/dist/dev/incubator/griffin/0.3.0-incubating/griffin-0.3.0-incubating-source-release.zip.sha512";>griffin-0.3.0-incubating-source-release.zip.sha512 + https://dist.apache.org/repos/dist/dev/incubator/griffin/0.3.0-incubating/griffin-0.3.0-incubating-source-release.zip.asc";>griffin-0.3.0-incubating-source-release.zip.asc + + + Git revision: + + tag: https://git-wip-us.apache.org/repos/asf?p=incubator-griffin.git;a=tag;h=refs/tags/griffin-0.3.0-incubating";>griffin-0.3.0-incubating + + + + +0.2.0 + + Release notes: + + https://dist.apache.org/repos/dist/dev/incubator/griffin/0.2.0-incubating/CHANGES.txt";>griffin 0.2.0 Release Notes + + + Source download: + + https://dist.apache.org/repos/dist/dev/incubator/griffin/0.2.0-incubating/griffin-0.2.0-incubating-source-release.zip";>griffin-0.2.0-incubating-source-release.zip + https://dist.apache.org/repos/dist/
incubator-griffin-site git commit: update Archived downloads
Repository: incubator-griffin-site Updated Branches: refs/heads/master c1aa24906 -> 65142936c update Archived downloads Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/commit/65142936 Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/tree/65142936 Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/diff/65142936 Branch: refs/heads/master Commit: 65142936c8633a7693174e90ca03e285afc0e445 Parents: c1aa249 Author: William Guo Authored: Wed Sep 19 16:45:54 2018 +0800 Committer: William Guo Committed: Wed Sep 19 16:45:54 2018 +0800 -- _config.yml | 2 -- download.md | 56 ++-- latest.md | 17 +++-- 3 files changed, 69 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/65142936/_config.yml -- diff --git a/_config.yml b/_config.yml index 0fb297f..102f984 100644 --- a/_config.yml +++ b/_config.yml @@ -47,8 +47,6 @@ documentations: links: - title: Contribution url: /docs/contribute.html - - title: Latest version (v0.3.0) -url: /docs/latest.html - category: Download links: - title: Latest version (v0.3.0) http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/65142936/download.md -- diff --git a/download.md b/download.md index a40e3b9..72c9a17 100644 --- a/download.md +++ b/download.md @@ -1,8 +1,60 @@ --- layout: doc -title: "Download Apache Griffin" +title: "Apache Griffin Latest Download" permalink: /docs/download.html --- -### Download Apache Griffin +> Version **0.3.0** is the latest release. +> +> You can verify your download by following these [procedures](https://www.apache.org/info/verification.html) and using these [KEYS](https://dist.apache.org/repos/dist/dev/incubator/griffin/KEYS). +# 0.3.0 +* Release notes: + * [griffin 0.3.0 Release Notes](https://dist.apache.org/repos/dist/dev/incubator/griffin/0.3.0-incubating/CHANGES.txt) +* Source download: + * [griffin-0.3.0-incubating-source-release.zip](https://dist.apache.org/repos/dist/dev/incubator/griffin/0.3.0-incubating/griffin-0.3.0-incubating-source-release.zip) + * [griffin-0.3.0-incubating-source-release.zip.sha512](https://dist.apache.org/repos/dist/dev/incubator/griffin/0.3.0-incubating/griffin-0.3.0-incubating-source-release.zip.sha512) + * [griffin-0.3.0-incubating-source-release.zip.asc](https://dist.apache.org/repos/dist/dev/incubator/griffin/0.3.0-incubating/griffin-0.3.0-incubating-source-release.zip.asc) +* Git revision: + * tag: [griffin-0.3.0-incubating](https://git-wip-us.apache.org/repos/asf?p=incubator-griffin.git;a=tag;h=refs/tags/griffin-0.3.0-incubating) + + +# 0.2.0 +* Release notes: + * [griffin 0.2.0 Release Notes](https://dist.apache.org/repos/dist/dev/incubator/griffin/0.2.0-incubating/CHANGES.txt) +* Source download: + * [griffin-0.2.0-incubating-source-release.zip](https://dist.apache.org/repos/dist/dev/incubator/griffin/0.2.0-incubating/griffin-0.2.0-incubating-source-release.zip) + * [griffin-0.2.0-incubating-source-release.zip.sha512](https://dist.apache.org/repos/dist/dev/incubator/griffin/0.2.0-incubating/griffin-0.2.0-incubating-source-release.zip.sha512) + * [griffin-0.2.0-incubating-source-release.zip.asc](https://dist.apache.org/repos/dist/dev/incubator/griffin/0.2.0-incubating/griffin-0.2.0-incubating-source-release.zip.asc) +* Git revision: + * tag: [griffin-0.2.0-incubating](https://git-wip-us.apache.org/repos/asf?p=incubator-griffin.git;a=tag;h=refs/tags/griffin-0.2.0-incubating) + +# 0.1.6 +* Release notes: + * [griffin 0.1.6 Release Notes](https://dist.apache.org/repos/dist/dev/incubator/griffin/0.1.6-incubating/CHANGES.txt) +* Source download: + * [griffin-0.1.6-incubating-source-release.zip](https://dist.apache.org/repos/dist/dev/incubator/griffin/0.1.6-incubating/griffin-0.1.6-incubating-source-release.zip) + * [griffin-0.1.6-incubating-source-release.zip.sha512](https://dist.apache.org/repos/dist/dev/incubator/griffin/0.1.6-incubating/griffin-0.1.6-incubating-source-release.zip.sha512) + * [griffin-0.1.6-incubating-source-release.zip.asc](https://dist.apache.org/repos/dist/dev/incubator/griffin/0.1.6-incubating/griffin-0.1.6-incubating-source-release.zip.asc) +* Git revision: + * tag: [griffin-0.1.6-incubating](https://git-wip-us.apache.org/repos/asf?p=incubator-griffin.git;a=tag;h=refs/tags/griffin-0.1.6-incubating) + +# 0.1.5 +* Release notes: + * [griffin 0.1.5 Release Notes](https://dist.apach
incubator-griffin-site git commit: Updated asf-site site from master (c1aa249063cc79a06f9eeb15c6435e90b65538c8)
Repository: incubator-griffin-site Updated Branches: refs/heads/asf-site 5558bdcb3 -> 8f47d3635 Updated asf-site site from master (c1aa249063cc79a06f9eeb15c6435e90b65538c8) Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/commit/8f47d363 Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/tree/8f47d363 Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/diff/8f47d363 Branch: refs/heads/asf-site Commit: 8f47d363523456a8e23697aabe5a7d5ce2a7954c Parents: 5558bdc Author: William Guo Authored: Wed Sep 19 08:52:38 2018 +0800 Committer: William Guo Committed: Wed Sep 19 08:52:38 2018 +0800 -- index.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/8f47d363/index.html -- diff --git a/index.html b/index.html index e9c976c..7da39f7 100755 --- a/index.html +++ b/index.html @@ -231,7 +231,7 @@ COMMUNITY -Contribution +Contribution Get help using Griffin or contribute to the project @@ -252,7 +252,7 @@ -Events +Events Learn more about Griffin from Conferences @@ -262,7 +262,7 @@ -Apache Software Foundation +Apache Software Foundation
incubator-griffin-site git commit: fix css style
Repository: incubator-griffin-site Updated Branches: refs/heads/master 077729686 -> c1aa24906 fix css style Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/commit/c1aa2490 Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/tree/c1aa2490 Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/diff/c1aa2490 Branch: refs/heads/master Commit: c1aa249063cc79a06f9eeb15c6435e90b65538c8 Parents: 0777296 Author: William Guo Authored: Wed Sep 19 08:51:32 2018 +0800 Committer: William Guo Committed: Wed Sep 19 08:51:32 2018 +0800 -- index.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/c1aa2490/index.html -- diff --git a/index.html b/index.html index e9c976c..7da39f7 100755 --- a/index.html +++ b/index.html @@ -231,7 +231,7 @@ COMMUNITY -Contribution +Contribution Get help using Griffin or contribute to the project @@ -252,7 +252,7 @@ -Events +Events Learn more about Griffin from Conferences @@ -262,7 +262,7 @@ -Apache Software Foundation +Apache Software Foundation
incubator-griffin-site git commit: Updated asf-site site from master (0777296868773f3456019df24829827a90b46fde)
Repository: incubator-griffin-site Updated Branches: refs/heads/asf-site 6eaa9c6f0 -> 5558bdcb3 Updated asf-site site from master (0777296868773f3456019df24829827a90b46fde) Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/commit/5558bdcb Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/tree/5558bdcb Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/diff/5558bdcb Branch: refs/heads/asf-site Commit: 5558bdcb38389a82d8adc73f8f7d0a55a82e3e48 Parents: 6eaa9c6 Author: William Guo Authored: Tue Sep 18 15:56:32 2018 +0800 Committer: William Guo Committed: Tue Sep 18 15:56:32 2018 +0800 -- docs/profiling.html | 162 ++- 1 file changed, 161 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/5558bdcb/docs/profiling.html -- diff --git a/docs/profiling.html b/docs/profiling.html index 273452f..1826c21 100644 --- a/docs/profiling.html +++ b/docs/profiling.html @@ -130,7 +130,167 @@ under the License. Profiling Use Case - +User Story +Say we have one data set(demo_src), partitioned by hour, we want to know what is the data like for each hour. + +For simplicity, suppose both two data set have the same schema as this: +id bigint +age int +descstring +dt string +hourstring + +both dt and hour are partitions, + +as every day we have one daily partition dt(like 20180912), + +for every day we have 24 hourly partitions(like 00, 01, 02, â¦, 23). + +Environment Preparation +You need to prepare the environment for Apache Griffin measure module, including the following software: + + JDK (1.8+) + Hadoop (2.6.0+) + Spark (2.2.1+) + Hive (2.2.0) + + +Build Griffin Measure Module + + Download Griffin source package https://www.apache.org/dist/incubator/griffin/0.3.0-incubating";>here. + Unzip the source package. +unzip griffin-0.3.0-incubating-source-release.zip +cd griffin-0.3.0-incubating-source-release + + + Build Griffin jars. +mvn clean install + + +Move the built griffin measure jar to your work path. + +mv measure/target/measure-0.3.0-incubating.jar/griffin-measure.jar + + + + +Data Preparation + +For our quick start, We will generate a hive table demo_src. +--create hive tables here. hql script +--Note: replace hdfs location with your own path +CREATE EXTERNAL TABLE `demo_src`( + `id` bigint, + `age` int, + `desc` string) +PARTITIONED BY ( + `dt` string, + `hour` string) +ROW FORMAT DELIMITED + FIELDS TERMINATED BY '|' +LOCATION + 'hdfs:///griffin/data/batch/demo_src'; + +The data could be generated this: +1|18|student +2|23|engineer +3|42|cook +... + +You can download demo data and execute ./gen_demo_data.sh to get the data source file. +Then we will load data into hive table for every hour. +LOAD DATA LOCAL INPATH 'demo_src' INTO TABLE demo_src PARTITION (dt='20180912',hour='09'); + +Or you can just execute ./gen-hive-data.sh in the downloaded directory above, to generate and load data into the tables hourly. + +Define data quality measure + +Griffin env configuration +The environment config file: env.json +{ + "spark": { +"log.level": "WARN" + }, + "sinks": [ +{ + "type": "console" +}, +{ + "type": "hdfs", + "config": { +"path": "hdfs:///griffin/persist" + } +}, +{ + "type": "elasticsearch", + "config": { +"method": "post", +"api": "http://es:9200/griffin/accuracy"; + } +} + ] +} + + +Define griffin data quality +The DQ config file: dq.json + +{ + "name": "batch_prof", + "process.type": "batch", + "data.sources": [ +{ + "name": "src", + "baseline": true, + "connectors": [ +{ + "type": "hive", + "version": "1.2", + "config": { +"database": "default", +"table.name": "demo_tgt" + } +} + ] +} + ], + "evaluate.rule": { +"rules": [ + { +"dsl.type": "griffin-dsl", +"dq.type": "profiling", +"out.dataframe.name": "prof", +"rule": "src.id.count() AS id_count, src.age.max() AS age_max, src.desc.length().max() AS desc_length_max", +"out": [ + { +"type": "metric", +"name": "prof" + } +] + } +] + }, + "sinks": ["CONSOLE", "HDFS"] +} + + +
[2/2] incubator-griffin-site git commit: Merge branch 'profiling' of https://github.com/bhlx3lyx7/incubator-griffin-site
Merge branch 'profiling' of https://github.com/bhlx3lyx7/incubator-griffin-site Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/commit/07772968 Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/tree/07772968 Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/diff/07772968 Branch: refs/heads/master Commit: 0777296868773f3456019df24829827a90b46fde Parents: 3891ad0 ce45b1d Author: William Guo Authored: Tue Sep 18 15:54:30 2018 +0800 Committer: William Guo Committed: Tue Sep 18 15:54:30 2018 +0800 -- profiling.md | 165 ++ 1 file changed, 165 insertions(+) --
[1/2] incubator-griffin-site git commit: profiling
Repository: incubator-griffin-site
Updated Branches:
refs/heads/master 3891ad018 -> 077729686
profiling
Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/repo
Commit:
http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/commit/ce45b1dd
Tree:
http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/tree/ce45b1dd
Diff:
http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/diff/ce45b1dd
Branch: refs/heads/master
Commit: ce45b1dd3fbf6f9cf18c5995ab5d6cfcaa37827e
Parents: 78070b8
Author: Lionel Liu
Authored: Tue Sep 18 15:33:57 2018 +0800
Committer: Lionel Liu
Committed: Tue Sep 18 15:33:57 2018 +0800
--
profiling.md | 165 ++
1 file changed, 165 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/ce45b1dd/profiling.md
--
diff --git a/profiling.md b/profiling.md
index e7a473e..8422a17 100644
--- a/profiling.md
+++ b/profiling.md
@@ -3,3 +3,168 @@ layout: doc
title: "Profiling Use Case"
permalink: /docs/profiling.html
---
+## User Story
+Say we have one data set(demo_src), partitioned by hour, we want to know what
is the data like for each hour.
+
+For simplicity, suppose both two data set have the same schema as this:
+```
+id bigint
+age int
+descstring
+dt string
+hourstring
+```
+both dt and hour are partitions,
+
+as every day we have one daily partition dt(like 20180912),
+
+for every day we have 24 hourly partitions(like 00, 01, 02, ..., 23).
+
+## Environment Preparation
+You need to prepare the environment for Apache Griffin measure module,
including the following software:
+- JDK (1.8+)
+- Hadoop (2.6.0+)
+- Spark (2.2.1+)
+- Hive (2.2.0)
+
+## Build Griffin Measure Module
+1. Download Griffin source package
[here](https://www.apache.org/dist/incubator/griffin/0.3.0-incubating).
+2. Unzip the source package.
+```
+unzip griffin-0.3.0-incubating-source-release.zip
+cd griffin-0.3.0-incubating-source-release
+```
+3. Build Griffin jars.
+```
+mvn clean install
+```
+
+Move the built griffin measure jar to your work path.
+
+```
+mv measure/target/measure-0.3.0-incubating.jar /griffin-measure.jar
+```
+
+## Data Preparation
+
+For our quick start, We will generate a hive table demo_src.
+```
+--create hive tables here. hql script
+--Note: replace hdfs location with your own path
+CREATE EXTERNAL TABLE `demo_src`(
+ `id` bigint,
+ `age` int,
+ `desc` string)
+PARTITIONED BY (
+ `dt` string,
+ `hour` string)
+ROW FORMAT DELIMITED
+ FIELDS TERMINATED BY '|'
+LOCATION
+ 'hdfs:///griffin/data/batch/demo_src';
+```
+The data could be generated this:
+```
+1|18|student
+2|23|engineer
+3|42|cook
+...
+```
+You can download [demo data](/data/batch) and execute `./gen_demo_data.sh` to
get the data source file.
+Then we will load data into hive table for every hour.
+```
+LOAD DATA LOCAL INPATH 'demo_src' INTO TABLE demo_src PARTITION
(dt='20180912',hour='09');
+```
+Or you can just execute `./gen-hive-data.sh` in the downloaded directory
above, to generate and load data into the tables hourly.
+
+## Define data quality measure
+
+ Griffin env configuration
+The environment config file: env.json
+```
+{
+ "spark": {
+"log.level": "WARN"
+ },
+ "sinks": [
+{
+ "type": "console"
+},
+{
+ "type": "hdfs",
+ "config": {
+"path": "hdfs:///griffin/persist"
+ }
+},
+{
+ "type": "elasticsearch",
+ "config": {
+"method": "post",
+"api": "http://es:9200/griffin/accuracy";
+ }
+}
+ ]
+}
+```
+
+ Define griffin data quality
+The DQ config file: dq.json
+
+```
+{
+ "name": "batch_prof",
+ "process.type": "batch",
+ "data.sources": [
+{
+ "name": "src",
+ "baseline": true,
+ "connectors": [
+{
+ "type": "hive",
+ "version": "1.2",
+ "config": {
+"database": "default",
+"table.name": "demo_tgt"
+ }
+}
+ ]
+}
+ ],
+ "evaluate.rule": {
+"rules": [
+ {
+"dsl.type": "griffin-dsl",
+"dq.type": "profiling",
+"out.dataframe.name": "prof",
+"rule": "src.id.count() AS id_count, src.age.max() AS age_max,
src.desc.length().max() AS desc_length_max",
+"out": [
+ {
+"type": "metric",
+"name": "prof"
+ }
+]
+ }
+]
+ },
+ "sinks": ["CONSOLE", "HDFS"]
+}
+```
+
+##
incubator-griffin-site git commit: Updated asf-site site from master (3891ad018ba16a3cfd221bcc76ea3e0035c2faa6)
Repository: incubator-griffin-site Updated Branches: refs/heads/asf-site 0d4135a55 -> 6eaa9c6f0 Updated asf-site site from master (3891ad018ba16a3cfd221bcc76ea3e0035c2faa6) Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/commit/6eaa9c6f Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/tree/6eaa9c6f Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/diff/6eaa9c6f Branch: refs/heads/asf-site Commit: 6eaa9c6f03e091a03f5e4c27da2918d7b3d46af4 Parents: 0d4135a Author: William Guo Authored: Tue Sep 18 15:45:27 2018 +0800 Committer: William Guo Committed: Tue Sep 18 15:45:27 2018 +0800 -- docs/community.html | 4 ++ docs/conf.html | 4 ++ docs/contribute.html | 4 ++ docs/download.html | 4 ++ docs/latest.html | 4 ++ docs/profiling.html | 172 ++ docs/quickstart.html | 4 ++ docs/usecases.html | 4 ++ 8 files changed, 200 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/6eaa9c6f/docs/community.html -- diff --git a/docs/community.html b/docs/community.html index 5c0445a..4db2f98 100644 --- a/docs/community.html +++ b/docs/community.html @@ -99,6 +99,8 @@ under the License. Streaming Use Cases + Profiling Use Cases + Community Conference @@ -107,6 +109,8 @@ under the License. Development + Contribution + Latest version (v0.3.0) http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/6eaa9c6f/docs/conf.html -- diff --git a/docs/conf.html b/docs/conf.html index f32b22c..4091411 100644 --- a/docs/conf.html +++ b/docs/conf.html @@ -99,6 +99,8 @@ under the License. Streaming Use Cases + Profiling Use Cases + Community Conference @@ -107,6 +109,8 @@ under the License. Development + Contribution + Latest version (v0.3.0) http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/6eaa9c6f/docs/contribute.html -- diff --git a/docs/contribute.html b/docs/contribute.html index 3ef87ba..8df9e9c 100644 --- a/docs/contribute.html +++ b/docs/contribute.html @@ -99,6 +99,8 @@ under the License. Streaming Use Cases + Profiling Use Cases + Community Conference @@ -107,6 +109,8 @@ under the License. Development + Contribution + Latest version (v0.3.0) http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/6eaa9c6f/docs/download.html -- diff --git a/docs/download.html b/docs/download.html index d455b43..e7cf7ed 100644 --- a/docs/download.html +++ b/docs/download.html @@ -99,6 +99,8 @@ under the License. Streaming Use Cases + Profiling Use Cases + Community Conference @@ -107,6 +109,8 @@ under the License. Development + Contribution + Latest version (v0.3.0) http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/6eaa9c6f/docs/latest.html -- diff --git a/docs/latest.html b/docs/latest.html index 05e029a..33bc0e9 100644 --- a/docs/latest.html +++ b/docs/latest.html @@ -99,6 +99,8 @@ under the License. Streaming Use Cases + Profiling Use Cases + Community Conference @@ -107,6 +109,8 @@ under the License. Development + Contribution + Latest version (v0.3.0) http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/6eaa9c6f/docs/profiling.html -- diff --git a/docs/profiling.html b/docs/profiling.html new file mode 100644 index 000..273452f --- /dev/null +++ b/docs/profiling.html @@ -0,0 +1,172 @@ + + + + + + + Griffin - Profiling Use Case + + + + + + + + + + + + + + + + + + http://griffin.apache.org/feed.xml"; /> + + +
incubator-griffin-site git commit: add navigation
Repository: incubator-griffin-site Updated Branches: refs/heads/master 78070b850 -> 3891ad018 add navigation Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/commit/3891ad01 Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/tree/3891ad01 Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/diff/3891ad01 Branch: refs/heads/master Commit: 3891ad018ba16a3cfd221bcc76ea3e0035c2faa6 Parents: 78070b8 Author: William Guo Authored: Tue Sep 18 15:44:28 2018 +0800 Committer: William Guo Committed: Tue Sep 18 15:44:28 2018 +0800 -- _config.yml | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/3891ad01/_config.yml -- diff --git a/_config.yml b/_config.yml index f525d51..0fb297f 100644 --- a/_config.yml +++ b/_config.yml @@ -45,6 +45,8 @@ documentations: url: /docs/conf.html - category: Development links: + - title: Contribution +url: /docs/contribute.html - title: Latest version (v0.3.0) url: /docs/latest.html - category: Download
incubator-griffin-site git commit: init profiling
Repository: incubator-griffin-site Updated Branches: refs/heads/master 6b5057a35 -> 78070b850 init profiling Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/commit/78070b85 Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/tree/78070b85 Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/diff/78070b85 Branch: refs/heads/master Commit: 78070b8500835895b4a743f3cbf7560ddcd649d4 Parents: 6b5057a Author: William Guo Authored: Tue Sep 18 13:39:54 2018 +0800 Committer: William Guo Committed: Tue Sep 18 13:39:54 2018 +0800 -- _config.yml | 2 ++ profiling.md | 5 + 2 files changed, 7 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/78070b85/_config.yml -- diff --git a/_config.yml b/_config.yml index f65b811..f525d51 100644 --- a/_config.yml +++ b/_config.yml @@ -37,6 +37,8 @@ documentations: url: /docs/quickstart.html - title: Streaming Use Cases url: /docs/usecases.html + - title: Profiling Use Cases +url: /docs/profiling.html - title: Community url: /docs/community.html - title: Conference http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/78070b85/profiling.md -- diff --git a/profiling.md b/profiling.md new file mode 100644 index 000..e7a473e --- /dev/null +++ b/profiling.md @@ -0,0 +1,5 @@ +--- +layout: doc +title: "Profiling Use Case" +permalink: /docs/profiling.html +---
[4/9] incubator-griffin-site git commit: Updated asf-site site from master (6b5057a354098eaf0054a9a46714b44681c2cc18)
http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/0d4135a5/data/demo_basic -- diff --git a/data/demo_basic b/data/demo_basic deleted file mode 100644 index 464ef41..000 --- a/data/demo_basic +++ /dev/null @@ -1,124000 +0,0 @@ -0|1|1 -0|2|2 -0|3|3 -0|4|4 -0|5|5 -0|6|6 -0|7|7 -0|8|8 -0|9|9 -0|10|10 -0|11|11 -0|12|12 -0|13|13 -0|14|14 -0|15|15 -0|16|16 -0|17|17 -0|18|18 -0|19|19 -0|20|20 -0|21|21 -0|22|22 -0|23|23 -0|24|24 -0|25|25 -0|26|26 -0|27|27 -0|28|28 -0|29|29 -0|30|30 -0|31|31 -0|32|32 -0|33|33 -0|34|34 -0|35|35 -0|36|36 -0|37|37 -0|38|38 -0|39|39 -0|40|40 -0|41|41 -0|42|42 -0|43|43 -0|44|44 -0|45|45 -0|46|46 -0|47|47 -0|48|48 -0|49|49 -0|50|50 -0|51|51 -0|52|52 -0|53|53 -0|54|54 -0|55|55 -0|56|56 -0|57|57 -0|58|58 -0|59|59 -0|60|60 -0|61|61 -0|62|62 -0|63|63 -0|64|64 -0|65|65 -0|66|66 -0|67|67 -0|68|68 -0|69|69 -0|70|70 -0|71|71 -0|72|72 -0|73|73 -0|74|74 -0|75|75 -0|76|76 -0|77|77 -0|78|78 -0|79|79 -0|80|80 -0|81|81 -0|82|82 -0|83|83 -0|84|84 -0|85|85 -0|86|86 -0|87|87 -0|88|88 -0|89|89 -0|90|90 -0|91|91 -0|92|92 -0|93|93 -0|94|94 -0|95|95 -0|96|96 -0|97|97 -0|98|98 -0|99|99 -0|100|100 -0|101|101 -0|102|102 -0|103|103 -0|104|104 -0|105|105 -0|106|106 -0|107|107 -0|108|108 -0|109|109 -0|110|110 -0|111|111 -0|112|112 -0|113|113 -0|114|114 -0|115|115 -0|116|116 -0|117|117 -0|118|118 -0|119|119 -0|120|120 -0|121|121 -0|122|122 -0|123|123 -0|124|124 -0|125|125 -0|126|126 -0|127|127 -0|128|128 -0|129|129 -0|130|130 -0|131|131 -0|132|132 -0|133|133 -0|134|134 -0|135|135 -0|136|136 -0|137|137 -0|138|138 -0|139|139 -0|140|140 -0|141|141 -0|142|142 -0|143|143 -0|144|144 -0|145|145 -0|146|146 -0|147|147 -0|148|148 -0|149|149 -0|150|150 -0|151|151 -0|152|152 -0|153|153 -0|154|154 -0|155|155 -0|156|156 -0|157|157 -0|158|158 -0|159|159 -0|160|160 -0|161|161 -0|162|162 -0|163|163 -0|164|164 -0|165|165 -0|166|166 -0|167|167 -0|168|168 -0|169|169 -0|170|170 -0|171|171 -0|172|172 -0|173|173 -0|174|174 -0|175|175 -0|176|176 -0|177|177 -0|178|178 -0|179|179 -0|180|180 -0|181|181 -0|182|182 -0|183|183 -0|184|184 -0|185|185 -0|186|186 -0|187|187 -0|188|188 -0|189|189 -0|190|190 -0|191|191 -0|192|192 -0|193|193 -0|194|194 -0|195|195 -0|196|196 -0|197|197 -0|198|198 -0|199|199 -0|200|200 -0|201|201 -0|202|202 -0|203|203 -0|204|204 -0|205|205 -0|206|206 -0|207|207 -0|208|208 -0|209|209 -0|210|210 -0|211|211 -0|212|212 -0|213|213 -0|214|214 -0|215|215 -0|216|216 -0|217|217 -0|218|218 -0|219|219 -0|220|220 -0|221|221 -0|222|222 -0|223|223 -0|224|224 -0|225|225 -0|226|226 -0|227|227 -0|228|228 -0|229|229 -0|230|230 -0|231|231 -0|232|232 -0|233|233 -0|234|234 -0|235|235 -0|236|236 -0|237|237 -0|238|238 -0|239|239 -0|240|240 -0|241|241 -0|242|242 -0|243|243 -0|244|244 -0|245|245 -0|246|246 -0|247|247 -0|248|248 -0|249|249 -0|250|250 -0|251|251 -0|252|252 -0|253|253 -0|254|254 -0|255|255 -0|256|256 -0|257|257 -0|258|258 -0|259|259 -0|260|260 -0|261|261 -0|262|262 -0|263|263 -0|264|264 -0|265|265 -0|266|266 -0|267|267 -0|268|268 -0|269|269 -0|270|270 -0|271|271 -0|272|272 -0|273|273 -0|274|274 -0|275|275 -0|276|276 -0|277|277 -0|278|278 -0|279|279 -0|280|280 -0|281|281 -0|282|282 -0|283|283 -0|284|284 -0|285|285 -0|286|286 -0|287|287 -0|288|288 -0|289|289 -0|290|290 -0|291|291 -0|292|292 -0|293|293 -0|294|294 -0|295|295 -0|296|296 -0|297|297 -0|298|298 -0|299|299 -0|300|300 -0|301|301 -0|302|302 -0|303|303 -0|304|304 -0|305|305 -0|306|306 -0|307|307 -0|308|308 -0|309|309 -0|310|310 -0|311|311 -0|312|312 -0|313|313 -0|314|314 -0|315|315 -0|316|316 -0|317|317 -0|318|318 -0|319|319 -0|320|320 -0|321|321 -0|322|322 -0|323|323 -0|324|324 -0|325|325 -0|326|326 -0|327|327 -0|328|328 -0|329|329 -0|330|330 -0|331|331 -0|332|332 -0|333|333 -0|334|334 -0|335|335 -0|336|336 -0|337|337 -0|338|338 -0|339|339 -0|340|340 -0|341|341 -0|342|342 -0|343|343 -0|344|344 -0|345|345 -0|346|346 -0|347|347 -0|348|348 -0|349|349 -0|350|350 -0|351|351 -0|352|352 -0|353|353 -0|354|354 -0|355|355 -0|356|356 -0|357|357 -0|358|358 -0|359|359 -0|360|360 -0|361|361 -0|362|362 -0|363|363 -0|364|364 -0|365|365 -0|366|366 -0|367|367 -0|368|368 -0|369|369 -0|370|370 -0|371|371 -0|372|372 -0|373|373 -0|374|374 -0|375|375 -0|376|376 -0|377|377 -0|378|378 -0|379|379 -0|380|380 -0|381|381 -0|382|382 -0|383|383 -0|384|384 -0|385|385 -0|386|386 -0|387|387 -0|388|388 -0|389|389 -0|390|390 -0|391|391 -0|392|392 -0|393|393 -0|394|394 -0|395|395 -0|396|396 -0|397|397 -0|398|398 -0|399|399 -0|400|400 -0|401|401 -0|402|402 -0|403|403 -0|404|404 -0|405|405 -0|406|406 -0|407|407 -0|408|408 -0|409|409 -0|410|410 -0|411|411 -0|412|412 -0|413|413 -0|414|414 -0|415|415 -0|416|416 -0|417|417 -0|418|418 -0|419|419 -0|420|420 -0|421|421 -0|422|422 -0|423|423 -0|424|424 -0|425|425 -0|426|426 -0|427|427 -0|428|428 -0|429|429 -0|430|430 -0|431|431 -0|432|432 -0|433|433 -0|434|434 -0|435|435 -0|436|436 -0|437|437 -0|438|438 -0|439|439 -0|440|440 -0|441|441 -0|442|442 -0|443|443 -0|444|444 -0|445|445 -0|44
[7/9] incubator-griffin-site git commit: Updated asf-site site from master (6b5057a354098eaf0054a9a46714b44681c2cc18)
http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/0d4135a5/data/batch/demo_src -- diff --git a/data/batch/demo_src b/data/batch/demo_src new file mode 100644 index 000..e721447 --- /dev/null +++ b/data/batch/demo_src @@ -0,0 +1,125000 @@ +0|1|1 +0|2|2 +0|3|3 +0|4|4 +0|5|5 +0|6|6 +0|7|7 +0|8|8 +0|9|9 +0|10|10 +0|11|11 +0|12|12 +0|13|13 +0|14|14 +0|15|15 +0|16|16 +0|17|17 +0|18|18 +0|19|19 +0|20|20 +0|21|21 +0|22|22 +0|23|23 +0|24|24 +0|25|25 +0|26|26 +0|27|27 +0|28|28 +0|29|29 +0|30|30 +0|31|31 +0|32|32 +0|33|33 +0|34|34 +0|35|35 +0|36|36 +0|37|37 +0|38|38 +0|39|39 +0|40|40 +0|41|41 +0|42|42 +0|43|43 +0|44|44 +0|45|45 +0|46|46 +0|47|47 +0|48|48 +0|49|49 +0|50|50 +0|51|51 +0|52|52 +0|53|53 +0|54|54 +0|55|55 +0|56|56 +0|57|57 +0|58|58 +0|59|59 +0|60|60 +0|61|61 +0|62|62 +0|63|63 +0|64|64 +0|65|65 +0|66|66 +0|67|67 +0|68|68 +0|69|69 +0|70|70 +0|71|71 +0|72|72 +0|73|73 +0|74|74 +0|75|75 +0|76|76 +0|77|77 +0|78|78 +0|79|79 +0|80|80 +0|81|81 +0|82|82 +0|83|83 +0|84|84 +0|85|85 +0|86|86 +0|87|87 +0|88|88 +0|89|89 +0|90|90 +0|91|91 +0|92|92 +0|93|93 +0|94|94 +0|95|95 +0|96|96 +0|97|97 +0|98|98 +0|99|99 +0|100|100 +0|101|101 +0|102|102 +0|103|103 +0|104|104 +0|105|105 +0|106|106 +0|107|107 +0|108|108 +0|109|109 +0|110|110 +0|111|111 +0|112|112 +0|113|113 +0|114|114 +0|115|115 +0|116|116 +0|117|117 +0|118|118 +0|119|119 +0|120|120 +0|121|121 +0|122|122 +0|123|123 +0|124|124 +0|125|125 +0|126|126 +0|127|127 +0|128|128 +0|129|129 +0|130|130 +0|131|131 +0|132|132 +0|133|133 +0|134|134 +0|135|135 +0|136|136 +0|137|137 +0|138|138 +0|139|139 +0|140|140 +0|141|141 +0|142|142 +0|143|143 +0|144|144 +0|145|145 +0|146|146 +0|147|147 +0|148|148 +0|149|149 +0|150|150 +0|151|151 +0|152|152 +0|153|153 +0|154|154 +0|155|155 +0|156|156 +0|157|157 +0|158|158 +0|159|159 +0|160|160 +0|161|161 +0|162|162 +0|163|163 +0|164|164 +0|165|165 +0|166|166 +0|167|167 +0|168|168 +0|169|169 +0|170|170 +0|171|171 +0|172|172 +0|173|173 +0|174|174 +0|175|175 +0|176|176 +0|177|177 +0|178|178 +0|179|179 +0|180|180 +0|181|181 +0|182|182 +0|183|183 +0|184|184 +0|185|185 +0|186|186 +0|187|187 +0|188|188 +0|189|189 +0|190|190 +0|191|191 +0|192|192 +0|193|193 +0|194|194 +0|195|195 +0|196|196 +0|197|197 +0|198|198 +0|199|199 +0|200|200 +0|201|201 +0|202|202 +0|203|203 +0|204|204 +0|205|205 +0|206|206 +0|207|207 +0|208|208 +0|209|209 +0|210|210 +0|211|211 +0|212|212 +0|213|213 +0|214|214 +0|215|215 +0|216|216 +0|217|217 +0|218|218 +0|219|219 +0|220|220 +0|221|221 +0|222|222 +0|223|223 +0|224|224 +0|225|225 +0|226|226 +0|227|227 +0|228|228 +0|229|229 +0|230|230 +0|231|231 +0|232|232 +0|233|233 +0|234|234 +0|235|235 +0|236|236 +0|237|237 +0|238|238 +0|239|239 +0|240|240 +0|241|241 +0|242|242 +0|243|243 +0|244|244 +0|245|245 +0|246|246 +0|247|247 +0|248|248 +0|249|249 +0|250|250 +0|251|251 +0|252|252 +0|253|253 +0|254|254 +0|255|255 +0|256|256 +0|257|257 +0|258|258 +0|259|259 +0|260|260 +0|261|261 +0|262|262 +0|263|263 +0|264|264 +0|265|265 +0|266|266 +0|267|267 +0|268|268 +0|269|269 +0|270|270 +0|271|271 +0|272|272 +0|273|273 +0|274|274 +0|275|275 +0|276|276 +0|277|277 +0|278|278 +0|279|279 +0|280|280 +0|281|281 +0|282|282 +0|283|283 +0|284|284 +0|285|285 +0|286|286 +0|287|287 +0|288|288 +0|289|289 +0|290|290 +0|291|291 +0|292|292 +0|293|293 +0|294|294 +0|295|295 +0|296|296 +0|297|297 +0|298|298 +0|299|299 +0|300|300 +0|301|301 +0|302|302 +0|303|303 +0|304|304 +0|305|305 +0|306|306 +0|307|307 +0|308|308 +0|309|309 +0|310|310 +0|311|311 +0|312|312 +0|313|313 +0|314|314 +0|315|315 +0|316|316 +0|317|317 +0|318|318 +0|319|319 +0|320|320 +0|321|321 +0|322|322 +0|323|323 +0|324|324 +0|325|325 +0|326|326 +0|327|327 +0|328|328 +0|329|329 +0|330|330 +0|331|331 +0|332|332 +0|333|333 +0|334|334 +0|335|335 +0|336|336 +0|337|337 +0|338|338 +0|339|339 +0|340|340 +0|341|341 +0|342|342 +0|343|343 +0|344|344 +0|345|345 +0|346|346 +0|347|347 +0|348|348 +0|349|349 +0|350|350 +0|351|351 +0|352|352 +0|353|353 +0|354|354 +0|355|355 +0|356|356 +0|357|357 +0|358|358 +0|359|359 +0|360|360 +0|361|361 +0|362|362 +0|363|363 +0|364|364 +0|365|365 +0|366|366 +0|367|367 +0|368|368 +0|369|369 +0|370|370 +0|371|371 +0|372|372 +0|373|373 +0|374|374 +0|375|375 +0|376|376 +0|377|377 +0|378|378 +0|379|379 +0|380|380 +0|381|381 +0|382|382 +0|383|383 +0|384|384 +0|385|385 +0|386|386 +0|387|387 +0|388|388 +0|389|389 +0|390|390 +0|391|391 +0|392|392 +0|393|393 +0|394|394 +0|395|395 +0|396|396 +0|397|397 +0|398|398 +0|399|399 +0|400|400 +0|401|401 +0|402|402 +0|403|403 +0|404|404 +0|405|405 +0|406|406 +0|407|407 +0|408|408 +0|409|409 +0|410|410 +0|411|411 +0|412|412 +0|413|413 +0|414|414 +0|415|415 +0|416|416 +0|417|417 +0|418|418 +0|419|419 +0|420|420 +0|421|421 +0|422|422 +0|423|423 +0|424|424 +0|425|425 +0|426|426 +0|427|427 +0|428|428 +0|429|429 +0|430|430 +0|431|431 +0|432|432 +0|433|433 +0|434|434 +0|435|435 +0|436|436 +0|437|437 +0|438|438 +0|439|439 +0|440|440 +0|441|441 +0|442|442 +0|443|443 +0|444|444 +0|4
[5/9] incubator-griffin-site git commit: Updated asf-site site from master (6b5057a354098eaf0054a9a46714b44681c2cc18)
http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/0d4135a5/data/batch/gen-hive-data.sh
--
diff --git a/data/batch/gen-hive-data.sh b/data/batch/gen-hive-data.sh
new file mode 100755
index 000..6496eac
--- /dev/null
+++ b/data/batch/gen-hive-data.sh
@@ -0,0 +1,54 @@
+#!/bin/bash
+
+#create table
+hive -f create-table.hql
+echo "create table done"
+
+#current hour
+./gen_demo_data.sh
+cur_date=`date +%Y%m%d%H`
+dt=${cur_date:0:8}
+hour=${cur_date:8:2}
+partition_date="dt='$dt',hour='$hour'"
+sed s/PARTITION_DATE/$partition_date/ ./insert-data.hql.template >
insert-data.hql
+hive -f insert-data.hql
+src_done_path=/griffin/data/batch/demo_src/dt=${dt}/hour=${hour}/_DONE
+tgt_done_path=/griffin/data/batch/demo_tgt/dt=${dt}/hour=${hour}/_DONE
+hadoop fs -touchz ${src_done_path}
+hadoop fs -touchz ${tgt_done_path}
+echo "insert data [$partition_date] done"
+
+#last hour
+./gen_demo_data.sh
+cur_date=`date -d '1 hour ago' +%Y%m%d%H`
+dt=${cur_date:0:8}
+hour=${cur_date:8:2}
+partition_date="dt='$dt',hour='$hour'"
+sed s/PARTITION_DATE/$partition_date/ ./insert-data.hql.template >
insert-data.hql
+hive -f insert-data.hql
+src_done_path=/griffin/data/batch/demo_src/dt=${dt}/hour=${hour}/_DONE
+tgt_done_path=/griffin/data/batch/demo_tgt/dt=${dt}/hour=${hour}/_DONE
+hadoop fs -touchz ${src_done_path}
+hadoop fs -touchz ${tgt_done_path}
+echo "insert data [$partition_date] done"
+
+#next hours
+set +e
+while true
+do
+ ./gen_demo_data.sh
+ cur_date=`date +%Y%m%d%H`
+ next_date=`date -d "+1hour" '+%Y%m%d%H'`
+ dt=${next_date:0:8}
+ hour=${next_date:8:2}
+ partition_date="dt='$dt',hour='$hour'"
+ sed s/PARTITION_DATE/$partition_date/ ./insert-data.hql.template >
insert-data.hql
+ hive -f insert-data.hql
+ src_done_path=/griffin/data/batch/demo_src/dt=${dt}/hour=${hour}/_DONE
+ tgt_done_path=/griffin/data/batch/demo_tgt/dt=${dt}/hour=${hour}/_DONE
+ hadoop fs -touchz ${src_done_path}
+ hadoop fs -touchz ${tgt_done_path}
+ echo "insert data [$partition_date] done"
+ sleep 3600
+done
+set -e
http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/0d4135a5/data/batch/gen_delta_src.sh
--
diff --git a/data/batch/gen_delta_src.sh b/data/batch/gen_delta_src.sh
new file mode 100755
index 000..aeda259
--- /dev/null
+++ b/data/batch/gen_delta_src.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+file=delta_src
+id=124
+
+rm ${file}
+
+for i in {1..1000}
+do
+ idx=`shuf -i1-2000 -n1`
+ echo "${id}|${idx}|${idx}" >> ${file}
+done
+
http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/0d4135a5/data/batch/gen_demo_data.sh
--
diff --git a/data/batch/gen_demo_data.sh b/data/batch/gen_demo_data.sh
new file mode 100755
index 000..d85f306
--- /dev/null
+++ b/data/batch/gen_demo_data.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+./gen_delta_src.sh
+
+src=demo_src
+tgt=demo_tgt
+
+rm ${src}
+cat demo_basic >> ${src}
+cat delta_src >> ${src}
+
+rm ${tgt}
+cat demo_basic >> ${tgt}
+cat delta_tgt >> ${tgt}
http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/0d4135a5/data/batch/insert-data.hql.template
--
diff --git a/data/batch/insert-data.hql.template
b/data/batch/insert-data.hql.template
new file mode 100644
index 000..4e4039a
--- /dev/null
+++ b/data/batch/insert-data.hql.template
@@ -0,0 +1,2 @@
+LOAD DATA LOCAL INPATH 'demo_src' INTO TABLE demo_src PARTITION
(PARTITION_DATE);
+LOAD DATA LOCAL INPATH 'demo_tgt' INTO TABLE demo_tgt PARTITION
(PARTITION_DATE);
http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/0d4135a5/data/create-table.hql
--
diff --git a/data/create-table.hql b/data/create-table.hql
deleted file mode 100644
index b3827aa..000
--- a/data/create-table.hql
+++ /dev/null
@@ -1,24 +0,0 @@
-CREATE EXTERNAL TABLE `demo_src`(
- `id` bigint,
- `age` int,
- `desc` string)
-PARTITIONED BY (
- `dt` string,
- `hour` string)
-ROW FORMAT DELIMITED
- FIELDS TERMINATED BY '|'
-LOCATION
- 'hdfs:///griffin/data/batch/demo_src';
-
-CREATE EXTERNAL TABLE `demo_tgt`(
- `id` bigint,
- `age` int,
- `desc` string)
-PARTITIONED BY (
- `dt` string,
- `hour` string)
-ROW FORMAT DELIMITED
- FIELDS TERMINATED BY '|'
-LOCATION
- 'hdfs:///griffin/data/batch/demo_tgt';
-
http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/0d4135a5/data/delta_src
--
diff --git a/data/delta_src b/data/delta_src
deleted file mode 100644
index 2f90990..000
--- a/data/delta_src
+++ /dev/null
@@ -1,1000 +0,0 @@
-124|1|1
-124|2|2
-124|3|3
-124|4|4
-124|5|5
-124|6|6
-124|7|7
-124|8|8
-124|9|9
-124|10|10
-124|11|11
-124|12|12
-124|13|13
-124|14|14
-124|1
[8/9] incubator-griffin-site git commit: Updated asf-site site from master (6b5057a354098eaf0054a9a46714b44681c2cc18)
http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/0d4135a5/data/batch/demo_basic -- diff --git a/data/batch/demo_basic b/data/batch/demo_basic new file mode 100644 index 000..464ef41 --- /dev/null +++ b/data/batch/demo_basic @@ -0,0 +1,124000 @@ +0|1|1 +0|2|2 +0|3|3 +0|4|4 +0|5|5 +0|6|6 +0|7|7 +0|8|8 +0|9|9 +0|10|10 +0|11|11 +0|12|12 +0|13|13 +0|14|14 +0|15|15 +0|16|16 +0|17|17 +0|18|18 +0|19|19 +0|20|20 +0|21|21 +0|22|22 +0|23|23 +0|24|24 +0|25|25 +0|26|26 +0|27|27 +0|28|28 +0|29|29 +0|30|30 +0|31|31 +0|32|32 +0|33|33 +0|34|34 +0|35|35 +0|36|36 +0|37|37 +0|38|38 +0|39|39 +0|40|40 +0|41|41 +0|42|42 +0|43|43 +0|44|44 +0|45|45 +0|46|46 +0|47|47 +0|48|48 +0|49|49 +0|50|50 +0|51|51 +0|52|52 +0|53|53 +0|54|54 +0|55|55 +0|56|56 +0|57|57 +0|58|58 +0|59|59 +0|60|60 +0|61|61 +0|62|62 +0|63|63 +0|64|64 +0|65|65 +0|66|66 +0|67|67 +0|68|68 +0|69|69 +0|70|70 +0|71|71 +0|72|72 +0|73|73 +0|74|74 +0|75|75 +0|76|76 +0|77|77 +0|78|78 +0|79|79 +0|80|80 +0|81|81 +0|82|82 +0|83|83 +0|84|84 +0|85|85 +0|86|86 +0|87|87 +0|88|88 +0|89|89 +0|90|90 +0|91|91 +0|92|92 +0|93|93 +0|94|94 +0|95|95 +0|96|96 +0|97|97 +0|98|98 +0|99|99 +0|100|100 +0|101|101 +0|102|102 +0|103|103 +0|104|104 +0|105|105 +0|106|106 +0|107|107 +0|108|108 +0|109|109 +0|110|110 +0|111|111 +0|112|112 +0|113|113 +0|114|114 +0|115|115 +0|116|116 +0|117|117 +0|118|118 +0|119|119 +0|120|120 +0|121|121 +0|122|122 +0|123|123 +0|124|124 +0|125|125 +0|126|126 +0|127|127 +0|128|128 +0|129|129 +0|130|130 +0|131|131 +0|132|132 +0|133|133 +0|134|134 +0|135|135 +0|136|136 +0|137|137 +0|138|138 +0|139|139 +0|140|140 +0|141|141 +0|142|142 +0|143|143 +0|144|144 +0|145|145 +0|146|146 +0|147|147 +0|148|148 +0|149|149 +0|150|150 +0|151|151 +0|152|152 +0|153|153 +0|154|154 +0|155|155 +0|156|156 +0|157|157 +0|158|158 +0|159|159 +0|160|160 +0|161|161 +0|162|162 +0|163|163 +0|164|164 +0|165|165 +0|166|166 +0|167|167 +0|168|168 +0|169|169 +0|170|170 +0|171|171 +0|172|172 +0|173|173 +0|174|174 +0|175|175 +0|176|176 +0|177|177 +0|178|178 +0|179|179 +0|180|180 +0|181|181 +0|182|182 +0|183|183 +0|184|184 +0|185|185 +0|186|186 +0|187|187 +0|188|188 +0|189|189 +0|190|190 +0|191|191 +0|192|192 +0|193|193 +0|194|194 +0|195|195 +0|196|196 +0|197|197 +0|198|198 +0|199|199 +0|200|200 +0|201|201 +0|202|202 +0|203|203 +0|204|204 +0|205|205 +0|206|206 +0|207|207 +0|208|208 +0|209|209 +0|210|210 +0|211|211 +0|212|212 +0|213|213 +0|214|214 +0|215|215 +0|216|216 +0|217|217 +0|218|218 +0|219|219 +0|220|220 +0|221|221 +0|222|222 +0|223|223 +0|224|224 +0|225|225 +0|226|226 +0|227|227 +0|228|228 +0|229|229 +0|230|230 +0|231|231 +0|232|232 +0|233|233 +0|234|234 +0|235|235 +0|236|236 +0|237|237 +0|238|238 +0|239|239 +0|240|240 +0|241|241 +0|242|242 +0|243|243 +0|244|244 +0|245|245 +0|246|246 +0|247|247 +0|248|248 +0|249|249 +0|250|250 +0|251|251 +0|252|252 +0|253|253 +0|254|254 +0|255|255 +0|256|256 +0|257|257 +0|258|258 +0|259|259 +0|260|260 +0|261|261 +0|262|262 +0|263|263 +0|264|264 +0|265|265 +0|266|266 +0|267|267 +0|268|268 +0|269|269 +0|270|270 +0|271|271 +0|272|272 +0|273|273 +0|274|274 +0|275|275 +0|276|276 +0|277|277 +0|278|278 +0|279|279 +0|280|280 +0|281|281 +0|282|282 +0|283|283 +0|284|284 +0|285|285 +0|286|286 +0|287|287 +0|288|288 +0|289|289 +0|290|290 +0|291|291 +0|292|292 +0|293|293 +0|294|294 +0|295|295 +0|296|296 +0|297|297 +0|298|298 +0|299|299 +0|300|300 +0|301|301 +0|302|302 +0|303|303 +0|304|304 +0|305|305 +0|306|306 +0|307|307 +0|308|308 +0|309|309 +0|310|310 +0|311|311 +0|312|312 +0|313|313 +0|314|314 +0|315|315 +0|316|316 +0|317|317 +0|318|318 +0|319|319 +0|320|320 +0|321|321 +0|322|322 +0|323|323 +0|324|324 +0|325|325 +0|326|326 +0|327|327 +0|328|328 +0|329|329 +0|330|330 +0|331|331 +0|332|332 +0|333|333 +0|334|334 +0|335|335 +0|336|336 +0|337|337 +0|338|338 +0|339|339 +0|340|340 +0|341|341 +0|342|342 +0|343|343 +0|344|344 +0|345|345 +0|346|346 +0|347|347 +0|348|348 +0|349|349 +0|350|350 +0|351|351 +0|352|352 +0|353|353 +0|354|354 +0|355|355 +0|356|356 +0|357|357 +0|358|358 +0|359|359 +0|360|360 +0|361|361 +0|362|362 +0|363|363 +0|364|364 +0|365|365 +0|366|366 +0|367|367 +0|368|368 +0|369|369 +0|370|370 +0|371|371 +0|372|372 +0|373|373 +0|374|374 +0|375|375 +0|376|376 +0|377|377 +0|378|378 +0|379|379 +0|380|380 +0|381|381 +0|382|382 +0|383|383 +0|384|384 +0|385|385 +0|386|386 +0|387|387 +0|388|388 +0|389|389 +0|390|390 +0|391|391 +0|392|392 +0|393|393 +0|394|394 +0|395|395 +0|396|396 +0|397|397 +0|398|398 +0|399|399 +0|400|400 +0|401|401 +0|402|402 +0|403|403 +0|404|404 +0|405|405 +0|406|406 +0|407|407 +0|408|408 +0|409|409 +0|410|410 +0|411|411 +0|412|412 +0|413|413 +0|414|414 +0|415|415 +0|416|416 +0|417|417 +0|418|418 +0|419|419 +0|420|420 +0|421|421 +0|422|422 +0|423|423 +0|424|424 +0|425|425 +0|426|426 +0|427|427 +0|428|428 +0|429|429 +0|430|430 +0|431|431 +0|432|432 +0|433|433 +0|434|434 +0|435|435 +0|436|436 +0|437|437 +0|438|438 +0|439|439 +0|440|440 +0|441|441 +0|442|442 +0|443|443 +0|444|
[1/9] incubator-griffin-site git commit: Updated asf-site site from master (6b5057a354098eaf0054a9a46714b44681c2cc18)
Repository: incubator-griffin-site
Updated Branches:
refs/heads/asf-site ff8b8fb3d -> 0d4135a55
http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/0d4135a5/data/gen-hive-data.sh
--
diff --git a/data/gen-hive-data.sh b/data/gen-hive-data.sh
deleted file mode 100755
index 6496eac..000
--- a/data/gen-hive-data.sh
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/bash
-
-#create table
-hive -f create-table.hql
-echo "create table done"
-
-#current hour
-./gen_demo_data.sh
-cur_date=`date +%Y%m%d%H`
-dt=${cur_date:0:8}
-hour=${cur_date:8:2}
-partition_date="dt='$dt',hour='$hour'"
-sed s/PARTITION_DATE/$partition_date/ ./insert-data.hql.template >
insert-data.hql
-hive -f insert-data.hql
-src_done_path=/griffin/data/batch/demo_src/dt=${dt}/hour=${hour}/_DONE
-tgt_done_path=/griffin/data/batch/demo_tgt/dt=${dt}/hour=${hour}/_DONE
-hadoop fs -touchz ${src_done_path}
-hadoop fs -touchz ${tgt_done_path}
-echo "insert data [$partition_date] done"
-
-#last hour
-./gen_demo_data.sh
-cur_date=`date -d '1 hour ago' +%Y%m%d%H`
-dt=${cur_date:0:8}
-hour=${cur_date:8:2}
-partition_date="dt='$dt',hour='$hour'"
-sed s/PARTITION_DATE/$partition_date/ ./insert-data.hql.template >
insert-data.hql
-hive -f insert-data.hql
-src_done_path=/griffin/data/batch/demo_src/dt=${dt}/hour=${hour}/_DONE
-tgt_done_path=/griffin/data/batch/demo_tgt/dt=${dt}/hour=${hour}/_DONE
-hadoop fs -touchz ${src_done_path}
-hadoop fs -touchz ${tgt_done_path}
-echo "insert data [$partition_date] done"
-
-#next hours
-set +e
-while true
-do
- ./gen_demo_data.sh
- cur_date=`date +%Y%m%d%H`
- next_date=`date -d "+1hour" '+%Y%m%d%H'`
- dt=${next_date:0:8}
- hour=${next_date:8:2}
- partition_date="dt='$dt',hour='$hour'"
- sed s/PARTITION_DATE/$partition_date/ ./insert-data.hql.template >
insert-data.hql
- hive -f insert-data.hql
- src_done_path=/griffin/data/batch/demo_src/dt=${dt}/hour=${hour}/_DONE
- tgt_done_path=/griffin/data/batch/demo_tgt/dt=${dt}/hour=${hour}/_DONE
- hadoop fs -touchz ${src_done_path}
- hadoop fs -touchz ${tgt_done_path}
- echo "insert data [$partition_date] done"
- sleep 3600
-done
-set -e
http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/0d4135a5/data/gen_delta_src.sh
--
diff --git a/data/gen_delta_src.sh b/data/gen_delta_src.sh
deleted file mode 100755
index aeda259..000
--- a/data/gen_delta_src.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-file=delta_src
-id=124
-
-rm ${file}
-
-for i in {1..1000}
-do
- idx=`shuf -i1-2000 -n1`
- echo "${id}|${idx}|${idx}" >> ${file}
-done
-
http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/0d4135a5/data/gen_demo_data.sh
--
diff --git a/data/gen_demo_data.sh b/data/gen_demo_data.sh
deleted file mode 100755
index d85f306..000
--- a/data/gen_demo_data.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-./gen_delta_src.sh
-
-src=demo_src
-tgt=demo_tgt
-
-rm ${src}
-cat demo_basic >> ${src}
-cat delta_src >> ${src}
-
-rm ${tgt}
-cat demo_basic >> ${tgt}
-cat delta_tgt >> ${tgt}
http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/0d4135a5/data/insert-data.hql.template
--
diff --git a/data/insert-data.hql.template b/data/insert-data.hql.template
deleted file mode 100644
index 4e4039a..000
--- a/data/insert-data.hql.template
+++ /dev/null
@@ -1,2 +0,0 @@
-LOAD DATA LOCAL INPATH 'demo_src' INTO TABLE demo_src PARTITION
(PARTITION_DATE);
-LOAD DATA LOCAL INPATH 'demo_tgt' INTO TABLE demo_tgt PARTITION
(PARTITION_DATE);
http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/0d4135a5/data/streaming/gen-data.sh
--
diff --git a/data/streaming/gen-data.sh b/data/streaming/gen-data.sh
new file mode 100755
index 000..e2ad8bd
--- /dev/null
+++ b/data/streaming/gen-data.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+#current time
+cur_time=`date +%Y-%m-%d_%H:%M:%S`
+sed s/TIME/$cur_time/ ./source.temp > source.tp
+sed s/TIME/$cur_time/ ./target.temp > target.tp
+
+#create data
+for row in 1 2 3 4 5 6 7 8 9 10
+do
+ sed -n "${row}p" < source.tp > sline
+ cnt=`shuf -i1-2 -n1`
+ clr="red"
+ if [ $cnt == 2 ]; then clr="yellow"; fi
+ sed s/COLOR/$clr/ sline >> source.data
+done
+rm sline
+
+cat target.tp > target.data
+
+rm source.tp target.tp
+
+#import data
+kafka-console-producer.sh --broker-list localhost:9092 --topic source
--new-producer < source.data
+kafka-console-producer.sh --broker-list localhost:9092 --topic target
--new-producer < target.data
+
+rm source.data target.data
+
+echo "insert data at ${cur_time}"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/0d4135a5/data/streaming/source.temp
[6/9] incubator-griffin-site git commit: Updated asf-site site from master (6b5057a354098eaf0054a9a46714b44681c2cc18)
http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/0d4135a5/data/batch/demo_tgt -- diff --git a/data/batch/demo_tgt b/data/batch/demo_tgt new file mode 100644 index 000..f7c1b64 --- /dev/null +++ b/data/batch/demo_tgt @@ -0,0 +1,125000 @@ +0|1|1 +0|2|2 +0|3|3 +0|4|4 +0|5|5 +0|6|6 +0|7|7 +0|8|8 +0|9|9 +0|10|10 +0|11|11 +0|12|12 +0|13|13 +0|14|14 +0|15|15 +0|16|16 +0|17|17 +0|18|18 +0|19|19 +0|20|20 +0|21|21 +0|22|22 +0|23|23 +0|24|24 +0|25|25 +0|26|26 +0|27|27 +0|28|28 +0|29|29 +0|30|30 +0|31|31 +0|32|32 +0|33|33 +0|34|34 +0|35|35 +0|36|36 +0|37|37 +0|38|38 +0|39|39 +0|40|40 +0|41|41 +0|42|42 +0|43|43 +0|44|44 +0|45|45 +0|46|46 +0|47|47 +0|48|48 +0|49|49 +0|50|50 +0|51|51 +0|52|52 +0|53|53 +0|54|54 +0|55|55 +0|56|56 +0|57|57 +0|58|58 +0|59|59 +0|60|60 +0|61|61 +0|62|62 +0|63|63 +0|64|64 +0|65|65 +0|66|66 +0|67|67 +0|68|68 +0|69|69 +0|70|70 +0|71|71 +0|72|72 +0|73|73 +0|74|74 +0|75|75 +0|76|76 +0|77|77 +0|78|78 +0|79|79 +0|80|80 +0|81|81 +0|82|82 +0|83|83 +0|84|84 +0|85|85 +0|86|86 +0|87|87 +0|88|88 +0|89|89 +0|90|90 +0|91|91 +0|92|92 +0|93|93 +0|94|94 +0|95|95 +0|96|96 +0|97|97 +0|98|98 +0|99|99 +0|100|100 +0|101|101 +0|102|102 +0|103|103 +0|104|104 +0|105|105 +0|106|106 +0|107|107 +0|108|108 +0|109|109 +0|110|110 +0|111|111 +0|112|112 +0|113|113 +0|114|114 +0|115|115 +0|116|116 +0|117|117 +0|118|118 +0|119|119 +0|120|120 +0|121|121 +0|122|122 +0|123|123 +0|124|124 +0|125|125 +0|126|126 +0|127|127 +0|128|128 +0|129|129 +0|130|130 +0|131|131 +0|132|132 +0|133|133 +0|134|134 +0|135|135 +0|136|136 +0|137|137 +0|138|138 +0|139|139 +0|140|140 +0|141|141 +0|142|142 +0|143|143 +0|144|144 +0|145|145 +0|146|146 +0|147|147 +0|148|148 +0|149|149 +0|150|150 +0|151|151 +0|152|152 +0|153|153 +0|154|154 +0|155|155 +0|156|156 +0|157|157 +0|158|158 +0|159|159 +0|160|160 +0|161|161 +0|162|162 +0|163|163 +0|164|164 +0|165|165 +0|166|166 +0|167|167 +0|168|168 +0|169|169 +0|170|170 +0|171|171 +0|172|172 +0|173|173 +0|174|174 +0|175|175 +0|176|176 +0|177|177 +0|178|178 +0|179|179 +0|180|180 +0|181|181 +0|182|182 +0|183|183 +0|184|184 +0|185|185 +0|186|186 +0|187|187 +0|188|188 +0|189|189 +0|190|190 +0|191|191 +0|192|192 +0|193|193 +0|194|194 +0|195|195 +0|196|196 +0|197|197 +0|198|198 +0|199|199 +0|200|200 +0|201|201 +0|202|202 +0|203|203 +0|204|204 +0|205|205 +0|206|206 +0|207|207 +0|208|208 +0|209|209 +0|210|210 +0|211|211 +0|212|212 +0|213|213 +0|214|214 +0|215|215 +0|216|216 +0|217|217 +0|218|218 +0|219|219 +0|220|220 +0|221|221 +0|222|222 +0|223|223 +0|224|224 +0|225|225 +0|226|226 +0|227|227 +0|228|228 +0|229|229 +0|230|230 +0|231|231 +0|232|232 +0|233|233 +0|234|234 +0|235|235 +0|236|236 +0|237|237 +0|238|238 +0|239|239 +0|240|240 +0|241|241 +0|242|242 +0|243|243 +0|244|244 +0|245|245 +0|246|246 +0|247|247 +0|248|248 +0|249|249 +0|250|250 +0|251|251 +0|252|252 +0|253|253 +0|254|254 +0|255|255 +0|256|256 +0|257|257 +0|258|258 +0|259|259 +0|260|260 +0|261|261 +0|262|262 +0|263|263 +0|264|264 +0|265|265 +0|266|266 +0|267|267 +0|268|268 +0|269|269 +0|270|270 +0|271|271 +0|272|272 +0|273|273 +0|274|274 +0|275|275 +0|276|276 +0|277|277 +0|278|278 +0|279|279 +0|280|280 +0|281|281 +0|282|282 +0|283|283 +0|284|284 +0|285|285 +0|286|286 +0|287|287 +0|288|288 +0|289|289 +0|290|290 +0|291|291 +0|292|292 +0|293|293 +0|294|294 +0|295|295 +0|296|296 +0|297|297 +0|298|298 +0|299|299 +0|300|300 +0|301|301 +0|302|302 +0|303|303 +0|304|304 +0|305|305 +0|306|306 +0|307|307 +0|308|308 +0|309|309 +0|310|310 +0|311|311 +0|312|312 +0|313|313 +0|314|314 +0|315|315 +0|316|316 +0|317|317 +0|318|318 +0|319|319 +0|320|320 +0|321|321 +0|322|322 +0|323|323 +0|324|324 +0|325|325 +0|326|326 +0|327|327 +0|328|328 +0|329|329 +0|330|330 +0|331|331 +0|332|332 +0|333|333 +0|334|334 +0|335|335 +0|336|336 +0|337|337 +0|338|338 +0|339|339 +0|340|340 +0|341|341 +0|342|342 +0|343|343 +0|344|344 +0|345|345 +0|346|346 +0|347|347 +0|348|348 +0|349|349 +0|350|350 +0|351|351 +0|352|352 +0|353|353 +0|354|354 +0|355|355 +0|356|356 +0|357|357 +0|358|358 +0|359|359 +0|360|360 +0|361|361 +0|362|362 +0|363|363 +0|364|364 +0|365|365 +0|366|366 +0|367|367 +0|368|368 +0|369|369 +0|370|370 +0|371|371 +0|372|372 +0|373|373 +0|374|374 +0|375|375 +0|376|376 +0|377|377 +0|378|378 +0|379|379 +0|380|380 +0|381|381 +0|382|382 +0|383|383 +0|384|384 +0|385|385 +0|386|386 +0|387|387 +0|388|388 +0|389|389 +0|390|390 +0|391|391 +0|392|392 +0|393|393 +0|394|394 +0|395|395 +0|396|396 +0|397|397 +0|398|398 +0|399|399 +0|400|400 +0|401|401 +0|402|402 +0|403|403 +0|404|404 +0|405|405 +0|406|406 +0|407|407 +0|408|408 +0|409|409 +0|410|410 +0|411|411 +0|412|412 +0|413|413 +0|414|414 +0|415|415 +0|416|416 +0|417|417 +0|418|418 +0|419|419 +0|420|420 +0|421|421 +0|422|422 +0|423|423 +0|424|424 +0|425|425 +0|426|426 +0|427|427 +0|428|428 +0|429|429 +0|430|430 +0|431|431 +0|432|432 +0|433|433 +0|434|434 +0|435|435 +0|436|436 +0|437|437 +0|438|438 +0|439|439 +0|440|440 +0|441|441 +0|442|442 +0|443|443 +0|444|444 +0|4
[2/9] incubator-griffin-site git commit: Updated asf-site site from master (6b5057a354098eaf0054a9a46714b44681c2cc18)
http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/0d4135a5/data/demo_tgt -- diff --git a/data/demo_tgt b/data/demo_tgt deleted file mode 100644 index f7c1b64..000 --- a/data/demo_tgt +++ /dev/null @@ -1,125000 +0,0 @@ -0|1|1 -0|2|2 -0|3|3 -0|4|4 -0|5|5 -0|6|6 -0|7|7 -0|8|8 -0|9|9 -0|10|10 -0|11|11 -0|12|12 -0|13|13 -0|14|14 -0|15|15 -0|16|16 -0|17|17 -0|18|18 -0|19|19 -0|20|20 -0|21|21 -0|22|22 -0|23|23 -0|24|24 -0|25|25 -0|26|26 -0|27|27 -0|28|28 -0|29|29 -0|30|30 -0|31|31 -0|32|32 -0|33|33 -0|34|34 -0|35|35 -0|36|36 -0|37|37 -0|38|38 -0|39|39 -0|40|40 -0|41|41 -0|42|42 -0|43|43 -0|44|44 -0|45|45 -0|46|46 -0|47|47 -0|48|48 -0|49|49 -0|50|50 -0|51|51 -0|52|52 -0|53|53 -0|54|54 -0|55|55 -0|56|56 -0|57|57 -0|58|58 -0|59|59 -0|60|60 -0|61|61 -0|62|62 -0|63|63 -0|64|64 -0|65|65 -0|66|66 -0|67|67 -0|68|68 -0|69|69 -0|70|70 -0|71|71 -0|72|72 -0|73|73 -0|74|74 -0|75|75 -0|76|76 -0|77|77 -0|78|78 -0|79|79 -0|80|80 -0|81|81 -0|82|82 -0|83|83 -0|84|84 -0|85|85 -0|86|86 -0|87|87 -0|88|88 -0|89|89 -0|90|90 -0|91|91 -0|92|92 -0|93|93 -0|94|94 -0|95|95 -0|96|96 -0|97|97 -0|98|98 -0|99|99 -0|100|100 -0|101|101 -0|102|102 -0|103|103 -0|104|104 -0|105|105 -0|106|106 -0|107|107 -0|108|108 -0|109|109 -0|110|110 -0|111|111 -0|112|112 -0|113|113 -0|114|114 -0|115|115 -0|116|116 -0|117|117 -0|118|118 -0|119|119 -0|120|120 -0|121|121 -0|122|122 -0|123|123 -0|124|124 -0|125|125 -0|126|126 -0|127|127 -0|128|128 -0|129|129 -0|130|130 -0|131|131 -0|132|132 -0|133|133 -0|134|134 -0|135|135 -0|136|136 -0|137|137 -0|138|138 -0|139|139 -0|140|140 -0|141|141 -0|142|142 -0|143|143 -0|144|144 -0|145|145 -0|146|146 -0|147|147 -0|148|148 -0|149|149 -0|150|150 -0|151|151 -0|152|152 -0|153|153 -0|154|154 -0|155|155 -0|156|156 -0|157|157 -0|158|158 -0|159|159 -0|160|160 -0|161|161 -0|162|162 -0|163|163 -0|164|164 -0|165|165 -0|166|166 -0|167|167 -0|168|168 -0|169|169 -0|170|170 -0|171|171 -0|172|172 -0|173|173 -0|174|174 -0|175|175 -0|176|176 -0|177|177 -0|178|178 -0|179|179 -0|180|180 -0|181|181 -0|182|182 -0|183|183 -0|184|184 -0|185|185 -0|186|186 -0|187|187 -0|188|188 -0|189|189 -0|190|190 -0|191|191 -0|192|192 -0|193|193 -0|194|194 -0|195|195 -0|196|196 -0|197|197 -0|198|198 -0|199|199 -0|200|200 -0|201|201 -0|202|202 -0|203|203 -0|204|204 -0|205|205 -0|206|206 -0|207|207 -0|208|208 -0|209|209 -0|210|210 -0|211|211 -0|212|212 -0|213|213 -0|214|214 -0|215|215 -0|216|216 -0|217|217 -0|218|218 -0|219|219 -0|220|220 -0|221|221 -0|222|222 -0|223|223 -0|224|224 -0|225|225 -0|226|226 -0|227|227 -0|228|228 -0|229|229 -0|230|230 -0|231|231 -0|232|232 -0|233|233 -0|234|234 -0|235|235 -0|236|236 -0|237|237 -0|238|238 -0|239|239 -0|240|240 -0|241|241 -0|242|242 -0|243|243 -0|244|244 -0|245|245 -0|246|246 -0|247|247 -0|248|248 -0|249|249 -0|250|250 -0|251|251 -0|252|252 -0|253|253 -0|254|254 -0|255|255 -0|256|256 -0|257|257 -0|258|258 -0|259|259 -0|260|260 -0|261|261 -0|262|262 -0|263|263 -0|264|264 -0|265|265 -0|266|266 -0|267|267 -0|268|268 -0|269|269 -0|270|270 -0|271|271 -0|272|272 -0|273|273 -0|274|274 -0|275|275 -0|276|276 -0|277|277 -0|278|278 -0|279|279 -0|280|280 -0|281|281 -0|282|282 -0|283|283 -0|284|284 -0|285|285 -0|286|286 -0|287|287 -0|288|288 -0|289|289 -0|290|290 -0|291|291 -0|292|292 -0|293|293 -0|294|294 -0|295|295 -0|296|296 -0|297|297 -0|298|298 -0|299|299 -0|300|300 -0|301|301 -0|302|302 -0|303|303 -0|304|304 -0|305|305 -0|306|306 -0|307|307 -0|308|308 -0|309|309 -0|310|310 -0|311|311 -0|312|312 -0|313|313 -0|314|314 -0|315|315 -0|316|316 -0|317|317 -0|318|318 -0|319|319 -0|320|320 -0|321|321 -0|322|322 -0|323|323 -0|324|324 -0|325|325 -0|326|326 -0|327|327 -0|328|328 -0|329|329 -0|330|330 -0|331|331 -0|332|332 -0|333|333 -0|334|334 -0|335|335 -0|336|336 -0|337|337 -0|338|338 -0|339|339 -0|340|340 -0|341|341 -0|342|342 -0|343|343 -0|344|344 -0|345|345 -0|346|346 -0|347|347 -0|348|348 -0|349|349 -0|350|350 -0|351|351 -0|352|352 -0|353|353 -0|354|354 -0|355|355 -0|356|356 -0|357|357 -0|358|358 -0|359|359 -0|360|360 -0|361|361 -0|362|362 -0|363|363 -0|364|364 -0|365|365 -0|366|366 -0|367|367 -0|368|368 -0|369|369 -0|370|370 -0|371|371 -0|372|372 -0|373|373 -0|374|374 -0|375|375 -0|376|376 -0|377|377 -0|378|378 -0|379|379 -0|380|380 -0|381|381 -0|382|382 -0|383|383 -0|384|384 -0|385|385 -0|386|386 -0|387|387 -0|388|388 -0|389|389 -0|390|390 -0|391|391 -0|392|392 -0|393|393 -0|394|394 -0|395|395 -0|396|396 -0|397|397 -0|398|398 -0|399|399 -0|400|400 -0|401|401 -0|402|402 -0|403|403 -0|404|404 -0|405|405 -0|406|406 -0|407|407 -0|408|408 -0|409|409 -0|410|410 -0|411|411 -0|412|412 -0|413|413 -0|414|414 -0|415|415 -0|416|416 -0|417|417 -0|418|418 -0|419|419 -0|420|420 -0|421|421 -0|422|422 -0|423|423 -0|424|424 -0|425|425 -0|426|426 -0|427|427 -0|428|428 -0|429|429 -0|430|430 -0|431|431 -0|432|432 -0|433|433 -0|434|434 -0|435|435 -0|436|436 -0|437|437 -0|438|438 -0|439|439 -0|440|440 -0|441|441 -0|442|442 -0|443|443 -0|444|444 -0|445|445 -0|446|446 -0
[3/9] incubator-griffin-site git commit: Updated asf-site site from master (6b5057a354098eaf0054a9a46714b44681c2cc18)
http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/0d4135a5/data/demo_src -- diff --git a/data/demo_src b/data/demo_src deleted file mode 100644 index e721447..000 --- a/data/demo_src +++ /dev/null @@ -1,125000 +0,0 @@ -0|1|1 -0|2|2 -0|3|3 -0|4|4 -0|5|5 -0|6|6 -0|7|7 -0|8|8 -0|9|9 -0|10|10 -0|11|11 -0|12|12 -0|13|13 -0|14|14 -0|15|15 -0|16|16 -0|17|17 -0|18|18 -0|19|19 -0|20|20 -0|21|21 -0|22|22 -0|23|23 -0|24|24 -0|25|25 -0|26|26 -0|27|27 -0|28|28 -0|29|29 -0|30|30 -0|31|31 -0|32|32 -0|33|33 -0|34|34 -0|35|35 -0|36|36 -0|37|37 -0|38|38 -0|39|39 -0|40|40 -0|41|41 -0|42|42 -0|43|43 -0|44|44 -0|45|45 -0|46|46 -0|47|47 -0|48|48 -0|49|49 -0|50|50 -0|51|51 -0|52|52 -0|53|53 -0|54|54 -0|55|55 -0|56|56 -0|57|57 -0|58|58 -0|59|59 -0|60|60 -0|61|61 -0|62|62 -0|63|63 -0|64|64 -0|65|65 -0|66|66 -0|67|67 -0|68|68 -0|69|69 -0|70|70 -0|71|71 -0|72|72 -0|73|73 -0|74|74 -0|75|75 -0|76|76 -0|77|77 -0|78|78 -0|79|79 -0|80|80 -0|81|81 -0|82|82 -0|83|83 -0|84|84 -0|85|85 -0|86|86 -0|87|87 -0|88|88 -0|89|89 -0|90|90 -0|91|91 -0|92|92 -0|93|93 -0|94|94 -0|95|95 -0|96|96 -0|97|97 -0|98|98 -0|99|99 -0|100|100 -0|101|101 -0|102|102 -0|103|103 -0|104|104 -0|105|105 -0|106|106 -0|107|107 -0|108|108 -0|109|109 -0|110|110 -0|111|111 -0|112|112 -0|113|113 -0|114|114 -0|115|115 -0|116|116 -0|117|117 -0|118|118 -0|119|119 -0|120|120 -0|121|121 -0|122|122 -0|123|123 -0|124|124 -0|125|125 -0|126|126 -0|127|127 -0|128|128 -0|129|129 -0|130|130 -0|131|131 -0|132|132 -0|133|133 -0|134|134 -0|135|135 -0|136|136 -0|137|137 -0|138|138 -0|139|139 -0|140|140 -0|141|141 -0|142|142 -0|143|143 -0|144|144 -0|145|145 -0|146|146 -0|147|147 -0|148|148 -0|149|149 -0|150|150 -0|151|151 -0|152|152 -0|153|153 -0|154|154 -0|155|155 -0|156|156 -0|157|157 -0|158|158 -0|159|159 -0|160|160 -0|161|161 -0|162|162 -0|163|163 -0|164|164 -0|165|165 -0|166|166 -0|167|167 -0|168|168 -0|169|169 -0|170|170 -0|171|171 -0|172|172 -0|173|173 -0|174|174 -0|175|175 -0|176|176 -0|177|177 -0|178|178 -0|179|179 -0|180|180 -0|181|181 -0|182|182 -0|183|183 -0|184|184 -0|185|185 -0|186|186 -0|187|187 -0|188|188 -0|189|189 -0|190|190 -0|191|191 -0|192|192 -0|193|193 -0|194|194 -0|195|195 -0|196|196 -0|197|197 -0|198|198 -0|199|199 -0|200|200 -0|201|201 -0|202|202 -0|203|203 -0|204|204 -0|205|205 -0|206|206 -0|207|207 -0|208|208 -0|209|209 -0|210|210 -0|211|211 -0|212|212 -0|213|213 -0|214|214 -0|215|215 -0|216|216 -0|217|217 -0|218|218 -0|219|219 -0|220|220 -0|221|221 -0|222|222 -0|223|223 -0|224|224 -0|225|225 -0|226|226 -0|227|227 -0|228|228 -0|229|229 -0|230|230 -0|231|231 -0|232|232 -0|233|233 -0|234|234 -0|235|235 -0|236|236 -0|237|237 -0|238|238 -0|239|239 -0|240|240 -0|241|241 -0|242|242 -0|243|243 -0|244|244 -0|245|245 -0|246|246 -0|247|247 -0|248|248 -0|249|249 -0|250|250 -0|251|251 -0|252|252 -0|253|253 -0|254|254 -0|255|255 -0|256|256 -0|257|257 -0|258|258 -0|259|259 -0|260|260 -0|261|261 -0|262|262 -0|263|263 -0|264|264 -0|265|265 -0|266|266 -0|267|267 -0|268|268 -0|269|269 -0|270|270 -0|271|271 -0|272|272 -0|273|273 -0|274|274 -0|275|275 -0|276|276 -0|277|277 -0|278|278 -0|279|279 -0|280|280 -0|281|281 -0|282|282 -0|283|283 -0|284|284 -0|285|285 -0|286|286 -0|287|287 -0|288|288 -0|289|289 -0|290|290 -0|291|291 -0|292|292 -0|293|293 -0|294|294 -0|295|295 -0|296|296 -0|297|297 -0|298|298 -0|299|299 -0|300|300 -0|301|301 -0|302|302 -0|303|303 -0|304|304 -0|305|305 -0|306|306 -0|307|307 -0|308|308 -0|309|309 -0|310|310 -0|311|311 -0|312|312 -0|313|313 -0|314|314 -0|315|315 -0|316|316 -0|317|317 -0|318|318 -0|319|319 -0|320|320 -0|321|321 -0|322|322 -0|323|323 -0|324|324 -0|325|325 -0|326|326 -0|327|327 -0|328|328 -0|329|329 -0|330|330 -0|331|331 -0|332|332 -0|333|333 -0|334|334 -0|335|335 -0|336|336 -0|337|337 -0|338|338 -0|339|339 -0|340|340 -0|341|341 -0|342|342 -0|343|343 -0|344|344 -0|345|345 -0|346|346 -0|347|347 -0|348|348 -0|349|349 -0|350|350 -0|351|351 -0|352|352 -0|353|353 -0|354|354 -0|355|355 -0|356|356 -0|357|357 -0|358|358 -0|359|359 -0|360|360 -0|361|361 -0|362|362 -0|363|363 -0|364|364 -0|365|365 -0|366|366 -0|367|367 -0|368|368 -0|369|369 -0|370|370 -0|371|371 -0|372|372 -0|373|373 -0|374|374 -0|375|375 -0|376|376 -0|377|377 -0|378|378 -0|379|379 -0|380|380 -0|381|381 -0|382|382 -0|383|383 -0|384|384 -0|385|385 -0|386|386 -0|387|387 -0|388|388 -0|389|389 -0|390|390 -0|391|391 -0|392|392 -0|393|393 -0|394|394 -0|395|395 -0|396|396 -0|397|397 -0|398|398 -0|399|399 -0|400|400 -0|401|401 -0|402|402 -0|403|403 -0|404|404 -0|405|405 -0|406|406 -0|407|407 -0|408|408 -0|409|409 -0|410|410 -0|411|411 -0|412|412 -0|413|413 -0|414|414 -0|415|415 -0|416|416 -0|417|417 -0|418|418 -0|419|419 -0|420|420 -0|421|421 -0|422|422 -0|423|423 -0|424|424 -0|425|425 -0|426|426 -0|427|427 -0|428|428 -0|429|429 -0|430|430 -0|431|431 -0|432|432 -0|433|433 -0|434|434 -0|435|435 -0|436|436 -0|437|437 -0|438|438 -0|439|439 -0|440|440 -0|441|441 -0|442|442 -0|443|443 -0|444|444 -0|445|445 -0|446|446 -0
[9/9] incubator-griffin-site git commit: Updated asf-site site from master (6b5057a354098eaf0054a9a46714b44681c2cc18)
Updated asf-site site from master (6b5057a354098eaf0054a9a46714b44681c2cc18) Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/commit/0d4135a5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/tree/0d4135a5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/diff/0d4135a5 Branch: refs/heads/asf-site Commit: 0d4135a55bc9f38414afc35b7d8f34ccf7031226 Parents: ff8b8fb Author: William Guo Authored: Tue Sep 18 11:11:59 2018 +0800 Committer: William Guo Committed: Tue Sep 18 11:11:59 2018 +0800 -- data/batch/create-table.hql | 24 + data/batch/delta_src| 1000 + data/batch/delta_tgt| 1000 + data/batch/demo_basic | 124000 +++ data/batch/demo_src | 125000 data/batch/demo_tgt | 125000 data/batch/gen-hive-data.sh | 54 + data/batch/gen_delta_src.sh | 13 + data/batch/gen_demo_data.sh | 14 + data/batch/insert-data.hql.template | 2 + data/create-table.hql | 24 - data/delta_src | 1000 - data/delta_tgt | 1000 - data/demo_basic | 124000 --- data/demo_src | 125000 data/demo_tgt | 125000 data/gen-hive-data.sh | 54 - data/gen_delta_src.sh | 13 - data/gen_demo_data.sh | 14 - data/insert-data.hql.template | 2 - data/streaming/gen-data.sh | 29 + data/streaming/source.temp | 10 + data/streaming/streaming-data.sh| 14 + data/streaming/target.temp | 10 + docs/quickstart.html| 4 +- docs/usecases.html |235 +- 26 files changed, 376406 insertions(+), 376110 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/0d4135a5/data/batch/create-table.hql -- diff --git a/data/batch/create-table.hql b/data/batch/create-table.hql new file mode 100644 index 000..b3827aa --- /dev/null +++ b/data/batch/create-table.hql @@ -0,0 +1,24 @@ +CREATE EXTERNAL TABLE `demo_src`( + `id` bigint, + `age` int, + `desc` string) +PARTITIONED BY ( + `dt` string, + `hour` string) +ROW FORMAT DELIMITED + FIELDS TERMINATED BY '|' +LOCATION + 'hdfs:///griffin/data/batch/demo_src'; + +CREATE EXTERNAL TABLE `demo_tgt`( + `id` bigint, + `age` int, + `desc` string) +PARTITIONED BY ( + `dt` string, + `hour` string) +ROW FORMAT DELIMITED + FIELDS TERMINATED BY '|' +LOCATION + 'hdfs:///griffin/data/batch/demo_tgt'; + http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/0d4135a5/data/batch/delta_src -- diff --git a/data/batch/delta_src b/data/batch/delta_src new file mode 100644 index 000..2f90990 --- /dev/null +++ b/data/batch/delta_src @@ -0,0 +1,1000 @@ +124|1|1 +124|2|2 +124|3|3 +124|4|4 +124|5|5 +124|6|6 +124|7|7 +124|8|8 +124|9|9 +124|10|10 +124|11|11 +124|12|12 +124|13|13 +124|14|14 +124|15|15 +124|16|16 +124|17|17 +124|18|18 +124|19|19 +124|20|20 +124|21|21 +124|22|22 +124|23|23 +124|24|24 +124|25|25 +124|26|26 +124|27|27 +124|28|28 +124|29|29 +124|30|30 +124|31|31 +124|32|32 +124|33|33 +124|34|34 +124|35|35 +124|36|36 +124|37|37 +124|38|38 +124|39|39 +124|40|40 +124|41|41 +124|42|42 +124|43|43 +124|44|44 +124|45|45 +124|46|46 +124|47|47 +124|48|48 +124|49|49 +124|50|50 +124|51|51 +124|52|52 +124|53|53 +124|54|54 +124|55|55 +124|56|56 +124|57|57 +124|58|58 +124|59|59 +124|60|60 +124|61|61 +124|62|62 +124|63|63 +124|64|64 +124|65|65 +124|66|66 +124|67|67 +124|68|68 +124|69|69 +124|70|70 +124|71|71 +124|72|72 +124|73|73 +124|74|74 +124|75|75 +124|76|76 +124|77|77 +124|78|78 +124|79|79 +124|80|80 +124|81|81 +124|82|82 +124|83|83 +124|84|84 +124|85|85 +124|86|86 +124|87|87 +124|88|88 +124|89|89 +124|90|90 +124|91|91 +124|92|92 +124|93|93 +124|94|94 +124|95|95 +124|96|96 +124|97|97 +124|98|98 +124|99|99 +124|100|100 +124|101|101 +124|102|102 +124|103|103 +124|104|104 +124|105|105 +124|106|106 +124|107|107 +124|108|108 +124|109|109 +124|110|110 +124|111|111 +124|112|112 +124|113|113 +124|114|114 +124|115|115 +124|116|116 +124|117|117 +124|118|118 +124|119|119 +124|120|120 +124|121|121 +124|122|122 +124|123|123 +124|124|124 +124|125|125 +124|126|126 +124|127|127 +124|128|128 +124|129|129 +124|130|130 +124|131|131 +124|132|132 +124|133|133 +124|134|134 +124|135|135 +124|136|136 +124|137|137 +124|138|138 +124|139|
[9/9] incubator-griffin-site git commit: streaming use case
streaming use case Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/commit/6b5057a3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/tree/6b5057a3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/diff/6b5057a3 Branch: refs/heads/master Commit: 6b5057a354098eaf0054a9a46714b44681c2cc18 Parents: 1d9ac68 Author: Lionel Liu Authored: Tue Sep 18 10:41:00 2018 +0800 Committer: Lionel Liu Committed: Tue Sep 18 10:41:00 2018 +0800 -- data/batch/create-table.hql | 24 + data/batch/delta_src| 1000 + data/batch/delta_tgt| 1000 + data/batch/demo_basic | 124000 +++ data/batch/demo_src | 125000 data/batch/demo_tgt | 125000 data/batch/gen-hive-data.sh | 54 + data/batch/gen_delta_src.sh | 13 + data/batch/gen_demo_data.sh | 14 + data/batch/insert-data.hql.template | 2 + data/create-table.hql | 24 - data/delta_src | 1000 - data/delta_tgt | 1000 - data/demo_basic | 124000 --- data/demo_src | 125000 data/demo_tgt | 125000 data/gen-hive-data.sh | 54 - data/gen_delta_src.sh | 13 - data/gen_demo_data.sh | 14 - data/insert-data.hql.template | 2 - data/streaming/gen-data.sh | 29 + data/streaming/source.temp | 10 + data/streaming/streaming-data.sh| 14 + data/streaming/target.temp | 10 + quickstart.md | 4 +- usecases.md |238 +- 26 files changed, 376409 insertions(+), 376110 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/6b5057a3/data/batch/create-table.hql -- diff --git a/data/batch/create-table.hql b/data/batch/create-table.hql new file mode 100644 index 000..b3827aa --- /dev/null +++ b/data/batch/create-table.hql @@ -0,0 +1,24 @@ +CREATE EXTERNAL TABLE `demo_src`( + `id` bigint, + `age` int, + `desc` string) +PARTITIONED BY ( + `dt` string, + `hour` string) +ROW FORMAT DELIMITED + FIELDS TERMINATED BY '|' +LOCATION + 'hdfs:///griffin/data/batch/demo_src'; + +CREATE EXTERNAL TABLE `demo_tgt`( + `id` bigint, + `age` int, + `desc` string) +PARTITIONED BY ( + `dt` string, + `hour` string) +ROW FORMAT DELIMITED + FIELDS TERMINATED BY '|' +LOCATION + 'hdfs:///griffin/data/batch/demo_tgt'; + http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/6b5057a3/data/batch/delta_src -- diff --git a/data/batch/delta_src b/data/batch/delta_src new file mode 100644 index 000..2f90990 --- /dev/null +++ b/data/batch/delta_src @@ -0,0 +1,1000 @@ +124|1|1 +124|2|2 +124|3|3 +124|4|4 +124|5|5 +124|6|6 +124|7|7 +124|8|8 +124|9|9 +124|10|10 +124|11|11 +124|12|12 +124|13|13 +124|14|14 +124|15|15 +124|16|16 +124|17|17 +124|18|18 +124|19|19 +124|20|20 +124|21|21 +124|22|22 +124|23|23 +124|24|24 +124|25|25 +124|26|26 +124|27|27 +124|28|28 +124|29|29 +124|30|30 +124|31|31 +124|32|32 +124|33|33 +124|34|34 +124|35|35 +124|36|36 +124|37|37 +124|38|38 +124|39|39 +124|40|40 +124|41|41 +124|42|42 +124|43|43 +124|44|44 +124|45|45 +124|46|46 +124|47|47 +124|48|48 +124|49|49 +124|50|50 +124|51|51 +124|52|52 +124|53|53 +124|54|54 +124|55|55 +124|56|56 +124|57|57 +124|58|58 +124|59|59 +124|60|60 +124|61|61 +124|62|62 +124|63|63 +124|64|64 +124|65|65 +124|66|66 +124|67|67 +124|68|68 +124|69|69 +124|70|70 +124|71|71 +124|72|72 +124|73|73 +124|74|74 +124|75|75 +124|76|76 +124|77|77 +124|78|78 +124|79|79 +124|80|80 +124|81|81 +124|82|82 +124|83|83 +124|84|84 +124|85|85 +124|86|86 +124|87|87 +124|88|88 +124|89|89 +124|90|90 +124|91|91 +124|92|92 +124|93|93 +124|94|94 +124|95|95 +124|96|96 +124|97|97 +124|98|98 +124|99|99 +124|100|100 +124|101|101 +124|102|102 +124|103|103 +124|104|104 +124|105|105 +124|106|106 +124|107|107 +124|108|108 +124|109|109 +124|110|110 +124|111|111 +124|112|112 +124|113|113 +124|114|114 +124|115|115 +124|116|116 +124|117|117 +124|118|118 +124|119|119 +124|120|120 +124|121|121 +124|122|122 +124|123|123 +124|124|124 +124|125|125 +124|126|126 +124|127|127 +124|128|128 +124|129|129 +124|130|130 +124|131|131 +124|132|132 +124|133|133 +124|134|134 +124|135|135 +124|136|136 +124|137|137 +124|138|138 +124|139|139 +124|140|140 +124|141|141 +124|142|142 +124|143|143 +124|1
[6/9] incubator-griffin-site git commit: streaming use case
http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/6b5057a3/data/batch/demo_tgt -- diff --git a/data/batch/demo_tgt b/data/batch/demo_tgt new file mode 100644 index 000..f7c1b64 --- /dev/null +++ b/data/batch/demo_tgt @@ -0,0 +1,125000 @@ +0|1|1 +0|2|2 +0|3|3 +0|4|4 +0|5|5 +0|6|6 +0|7|7 +0|8|8 +0|9|9 +0|10|10 +0|11|11 +0|12|12 +0|13|13 +0|14|14 +0|15|15 +0|16|16 +0|17|17 +0|18|18 +0|19|19 +0|20|20 +0|21|21 +0|22|22 +0|23|23 +0|24|24 +0|25|25 +0|26|26 +0|27|27 +0|28|28 +0|29|29 +0|30|30 +0|31|31 +0|32|32 +0|33|33 +0|34|34 +0|35|35 +0|36|36 +0|37|37 +0|38|38 +0|39|39 +0|40|40 +0|41|41 +0|42|42 +0|43|43 +0|44|44 +0|45|45 +0|46|46 +0|47|47 +0|48|48 +0|49|49 +0|50|50 +0|51|51 +0|52|52 +0|53|53 +0|54|54 +0|55|55 +0|56|56 +0|57|57 +0|58|58 +0|59|59 +0|60|60 +0|61|61 +0|62|62 +0|63|63 +0|64|64 +0|65|65 +0|66|66 +0|67|67 +0|68|68 +0|69|69 +0|70|70 +0|71|71 +0|72|72 +0|73|73 +0|74|74 +0|75|75 +0|76|76 +0|77|77 +0|78|78 +0|79|79 +0|80|80 +0|81|81 +0|82|82 +0|83|83 +0|84|84 +0|85|85 +0|86|86 +0|87|87 +0|88|88 +0|89|89 +0|90|90 +0|91|91 +0|92|92 +0|93|93 +0|94|94 +0|95|95 +0|96|96 +0|97|97 +0|98|98 +0|99|99 +0|100|100 +0|101|101 +0|102|102 +0|103|103 +0|104|104 +0|105|105 +0|106|106 +0|107|107 +0|108|108 +0|109|109 +0|110|110 +0|111|111 +0|112|112 +0|113|113 +0|114|114 +0|115|115 +0|116|116 +0|117|117 +0|118|118 +0|119|119 +0|120|120 +0|121|121 +0|122|122 +0|123|123 +0|124|124 +0|125|125 +0|126|126 +0|127|127 +0|128|128 +0|129|129 +0|130|130 +0|131|131 +0|132|132 +0|133|133 +0|134|134 +0|135|135 +0|136|136 +0|137|137 +0|138|138 +0|139|139 +0|140|140 +0|141|141 +0|142|142 +0|143|143 +0|144|144 +0|145|145 +0|146|146 +0|147|147 +0|148|148 +0|149|149 +0|150|150 +0|151|151 +0|152|152 +0|153|153 +0|154|154 +0|155|155 +0|156|156 +0|157|157 +0|158|158 +0|159|159 +0|160|160 +0|161|161 +0|162|162 +0|163|163 +0|164|164 +0|165|165 +0|166|166 +0|167|167 +0|168|168 +0|169|169 +0|170|170 +0|171|171 +0|172|172 +0|173|173 +0|174|174 +0|175|175 +0|176|176 +0|177|177 +0|178|178 +0|179|179 +0|180|180 +0|181|181 +0|182|182 +0|183|183 +0|184|184 +0|185|185 +0|186|186 +0|187|187 +0|188|188 +0|189|189 +0|190|190 +0|191|191 +0|192|192 +0|193|193 +0|194|194 +0|195|195 +0|196|196 +0|197|197 +0|198|198 +0|199|199 +0|200|200 +0|201|201 +0|202|202 +0|203|203 +0|204|204 +0|205|205 +0|206|206 +0|207|207 +0|208|208 +0|209|209 +0|210|210 +0|211|211 +0|212|212 +0|213|213 +0|214|214 +0|215|215 +0|216|216 +0|217|217 +0|218|218 +0|219|219 +0|220|220 +0|221|221 +0|222|222 +0|223|223 +0|224|224 +0|225|225 +0|226|226 +0|227|227 +0|228|228 +0|229|229 +0|230|230 +0|231|231 +0|232|232 +0|233|233 +0|234|234 +0|235|235 +0|236|236 +0|237|237 +0|238|238 +0|239|239 +0|240|240 +0|241|241 +0|242|242 +0|243|243 +0|244|244 +0|245|245 +0|246|246 +0|247|247 +0|248|248 +0|249|249 +0|250|250 +0|251|251 +0|252|252 +0|253|253 +0|254|254 +0|255|255 +0|256|256 +0|257|257 +0|258|258 +0|259|259 +0|260|260 +0|261|261 +0|262|262 +0|263|263 +0|264|264 +0|265|265 +0|266|266 +0|267|267 +0|268|268 +0|269|269 +0|270|270 +0|271|271 +0|272|272 +0|273|273 +0|274|274 +0|275|275 +0|276|276 +0|277|277 +0|278|278 +0|279|279 +0|280|280 +0|281|281 +0|282|282 +0|283|283 +0|284|284 +0|285|285 +0|286|286 +0|287|287 +0|288|288 +0|289|289 +0|290|290 +0|291|291 +0|292|292 +0|293|293 +0|294|294 +0|295|295 +0|296|296 +0|297|297 +0|298|298 +0|299|299 +0|300|300 +0|301|301 +0|302|302 +0|303|303 +0|304|304 +0|305|305 +0|306|306 +0|307|307 +0|308|308 +0|309|309 +0|310|310 +0|311|311 +0|312|312 +0|313|313 +0|314|314 +0|315|315 +0|316|316 +0|317|317 +0|318|318 +0|319|319 +0|320|320 +0|321|321 +0|322|322 +0|323|323 +0|324|324 +0|325|325 +0|326|326 +0|327|327 +0|328|328 +0|329|329 +0|330|330 +0|331|331 +0|332|332 +0|333|333 +0|334|334 +0|335|335 +0|336|336 +0|337|337 +0|338|338 +0|339|339 +0|340|340 +0|341|341 +0|342|342 +0|343|343 +0|344|344 +0|345|345 +0|346|346 +0|347|347 +0|348|348 +0|349|349 +0|350|350 +0|351|351 +0|352|352 +0|353|353 +0|354|354 +0|355|355 +0|356|356 +0|357|357 +0|358|358 +0|359|359 +0|360|360 +0|361|361 +0|362|362 +0|363|363 +0|364|364 +0|365|365 +0|366|366 +0|367|367 +0|368|368 +0|369|369 +0|370|370 +0|371|371 +0|372|372 +0|373|373 +0|374|374 +0|375|375 +0|376|376 +0|377|377 +0|378|378 +0|379|379 +0|380|380 +0|381|381 +0|382|382 +0|383|383 +0|384|384 +0|385|385 +0|386|386 +0|387|387 +0|388|388 +0|389|389 +0|390|390 +0|391|391 +0|392|392 +0|393|393 +0|394|394 +0|395|395 +0|396|396 +0|397|397 +0|398|398 +0|399|399 +0|400|400 +0|401|401 +0|402|402 +0|403|403 +0|404|404 +0|405|405 +0|406|406 +0|407|407 +0|408|408 +0|409|409 +0|410|410 +0|411|411 +0|412|412 +0|413|413 +0|414|414 +0|415|415 +0|416|416 +0|417|417 +0|418|418 +0|419|419 +0|420|420 +0|421|421 +0|422|422 +0|423|423 +0|424|424 +0|425|425 +0|426|426 +0|427|427 +0|428|428 +0|429|429 +0|430|430 +0|431|431 +0|432|432 +0|433|433 +0|434|434 +0|435|435 +0|436|436 +0|437|437 +0|438|438 +0|439|439 +0|440|440 +0|441|441 +0|442|442 +0|443|443 +0|444|444 +0|4
[4/9] incubator-griffin-site git commit: streaming use case
http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/6b5057a3/data/demo_basic -- diff --git a/data/demo_basic b/data/demo_basic deleted file mode 100644 index 464ef41..000 --- a/data/demo_basic +++ /dev/null @@ -1,124000 +0,0 @@ -0|1|1 -0|2|2 -0|3|3 -0|4|4 -0|5|5 -0|6|6 -0|7|7 -0|8|8 -0|9|9 -0|10|10 -0|11|11 -0|12|12 -0|13|13 -0|14|14 -0|15|15 -0|16|16 -0|17|17 -0|18|18 -0|19|19 -0|20|20 -0|21|21 -0|22|22 -0|23|23 -0|24|24 -0|25|25 -0|26|26 -0|27|27 -0|28|28 -0|29|29 -0|30|30 -0|31|31 -0|32|32 -0|33|33 -0|34|34 -0|35|35 -0|36|36 -0|37|37 -0|38|38 -0|39|39 -0|40|40 -0|41|41 -0|42|42 -0|43|43 -0|44|44 -0|45|45 -0|46|46 -0|47|47 -0|48|48 -0|49|49 -0|50|50 -0|51|51 -0|52|52 -0|53|53 -0|54|54 -0|55|55 -0|56|56 -0|57|57 -0|58|58 -0|59|59 -0|60|60 -0|61|61 -0|62|62 -0|63|63 -0|64|64 -0|65|65 -0|66|66 -0|67|67 -0|68|68 -0|69|69 -0|70|70 -0|71|71 -0|72|72 -0|73|73 -0|74|74 -0|75|75 -0|76|76 -0|77|77 -0|78|78 -0|79|79 -0|80|80 -0|81|81 -0|82|82 -0|83|83 -0|84|84 -0|85|85 -0|86|86 -0|87|87 -0|88|88 -0|89|89 -0|90|90 -0|91|91 -0|92|92 -0|93|93 -0|94|94 -0|95|95 -0|96|96 -0|97|97 -0|98|98 -0|99|99 -0|100|100 -0|101|101 -0|102|102 -0|103|103 -0|104|104 -0|105|105 -0|106|106 -0|107|107 -0|108|108 -0|109|109 -0|110|110 -0|111|111 -0|112|112 -0|113|113 -0|114|114 -0|115|115 -0|116|116 -0|117|117 -0|118|118 -0|119|119 -0|120|120 -0|121|121 -0|122|122 -0|123|123 -0|124|124 -0|125|125 -0|126|126 -0|127|127 -0|128|128 -0|129|129 -0|130|130 -0|131|131 -0|132|132 -0|133|133 -0|134|134 -0|135|135 -0|136|136 -0|137|137 -0|138|138 -0|139|139 -0|140|140 -0|141|141 -0|142|142 -0|143|143 -0|144|144 -0|145|145 -0|146|146 -0|147|147 -0|148|148 -0|149|149 -0|150|150 -0|151|151 -0|152|152 -0|153|153 -0|154|154 -0|155|155 -0|156|156 -0|157|157 -0|158|158 -0|159|159 -0|160|160 -0|161|161 -0|162|162 -0|163|163 -0|164|164 -0|165|165 -0|166|166 -0|167|167 -0|168|168 -0|169|169 -0|170|170 -0|171|171 -0|172|172 -0|173|173 -0|174|174 -0|175|175 -0|176|176 -0|177|177 -0|178|178 -0|179|179 -0|180|180 -0|181|181 -0|182|182 -0|183|183 -0|184|184 -0|185|185 -0|186|186 -0|187|187 -0|188|188 -0|189|189 -0|190|190 -0|191|191 -0|192|192 -0|193|193 -0|194|194 -0|195|195 -0|196|196 -0|197|197 -0|198|198 -0|199|199 -0|200|200 -0|201|201 -0|202|202 -0|203|203 -0|204|204 -0|205|205 -0|206|206 -0|207|207 -0|208|208 -0|209|209 -0|210|210 -0|211|211 -0|212|212 -0|213|213 -0|214|214 -0|215|215 -0|216|216 -0|217|217 -0|218|218 -0|219|219 -0|220|220 -0|221|221 -0|222|222 -0|223|223 -0|224|224 -0|225|225 -0|226|226 -0|227|227 -0|228|228 -0|229|229 -0|230|230 -0|231|231 -0|232|232 -0|233|233 -0|234|234 -0|235|235 -0|236|236 -0|237|237 -0|238|238 -0|239|239 -0|240|240 -0|241|241 -0|242|242 -0|243|243 -0|244|244 -0|245|245 -0|246|246 -0|247|247 -0|248|248 -0|249|249 -0|250|250 -0|251|251 -0|252|252 -0|253|253 -0|254|254 -0|255|255 -0|256|256 -0|257|257 -0|258|258 -0|259|259 -0|260|260 -0|261|261 -0|262|262 -0|263|263 -0|264|264 -0|265|265 -0|266|266 -0|267|267 -0|268|268 -0|269|269 -0|270|270 -0|271|271 -0|272|272 -0|273|273 -0|274|274 -0|275|275 -0|276|276 -0|277|277 -0|278|278 -0|279|279 -0|280|280 -0|281|281 -0|282|282 -0|283|283 -0|284|284 -0|285|285 -0|286|286 -0|287|287 -0|288|288 -0|289|289 -0|290|290 -0|291|291 -0|292|292 -0|293|293 -0|294|294 -0|295|295 -0|296|296 -0|297|297 -0|298|298 -0|299|299 -0|300|300 -0|301|301 -0|302|302 -0|303|303 -0|304|304 -0|305|305 -0|306|306 -0|307|307 -0|308|308 -0|309|309 -0|310|310 -0|311|311 -0|312|312 -0|313|313 -0|314|314 -0|315|315 -0|316|316 -0|317|317 -0|318|318 -0|319|319 -0|320|320 -0|321|321 -0|322|322 -0|323|323 -0|324|324 -0|325|325 -0|326|326 -0|327|327 -0|328|328 -0|329|329 -0|330|330 -0|331|331 -0|332|332 -0|333|333 -0|334|334 -0|335|335 -0|336|336 -0|337|337 -0|338|338 -0|339|339 -0|340|340 -0|341|341 -0|342|342 -0|343|343 -0|344|344 -0|345|345 -0|346|346 -0|347|347 -0|348|348 -0|349|349 -0|350|350 -0|351|351 -0|352|352 -0|353|353 -0|354|354 -0|355|355 -0|356|356 -0|357|357 -0|358|358 -0|359|359 -0|360|360 -0|361|361 -0|362|362 -0|363|363 -0|364|364 -0|365|365 -0|366|366 -0|367|367 -0|368|368 -0|369|369 -0|370|370 -0|371|371 -0|372|372 -0|373|373 -0|374|374 -0|375|375 -0|376|376 -0|377|377 -0|378|378 -0|379|379 -0|380|380 -0|381|381 -0|382|382 -0|383|383 -0|384|384 -0|385|385 -0|386|386 -0|387|387 -0|388|388 -0|389|389 -0|390|390 -0|391|391 -0|392|392 -0|393|393 -0|394|394 -0|395|395 -0|396|396 -0|397|397 -0|398|398 -0|399|399 -0|400|400 -0|401|401 -0|402|402 -0|403|403 -0|404|404 -0|405|405 -0|406|406 -0|407|407 -0|408|408 -0|409|409 -0|410|410 -0|411|411 -0|412|412 -0|413|413 -0|414|414 -0|415|415 -0|416|416 -0|417|417 -0|418|418 -0|419|419 -0|420|420 -0|421|421 -0|422|422 -0|423|423 -0|424|424 -0|425|425 -0|426|426 -0|427|427 -0|428|428 -0|429|429 -0|430|430 -0|431|431 -0|432|432 -0|433|433 -0|434|434 -0|435|435 -0|436|436 -0|437|437 -0|438|438 -0|439|439 -0|440|440 -0|441|441 -0|442|442 -0|443|443 -0|444|444 -0|445|445 -0|44
[3/9] incubator-griffin-site git commit: streaming use case
http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/6b5057a3/data/demo_src -- diff --git a/data/demo_src b/data/demo_src deleted file mode 100644 index e721447..000 --- a/data/demo_src +++ /dev/null @@ -1,125000 +0,0 @@ -0|1|1 -0|2|2 -0|3|3 -0|4|4 -0|5|5 -0|6|6 -0|7|7 -0|8|8 -0|9|9 -0|10|10 -0|11|11 -0|12|12 -0|13|13 -0|14|14 -0|15|15 -0|16|16 -0|17|17 -0|18|18 -0|19|19 -0|20|20 -0|21|21 -0|22|22 -0|23|23 -0|24|24 -0|25|25 -0|26|26 -0|27|27 -0|28|28 -0|29|29 -0|30|30 -0|31|31 -0|32|32 -0|33|33 -0|34|34 -0|35|35 -0|36|36 -0|37|37 -0|38|38 -0|39|39 -0|40|40 -0|41|41 -0|42|42 -0|43|43 -0|44|44 -0|45|45 -0|46|46 -0|47|47 -0|48|48 -0|49|49 -0|50|50 -0|51|51 -0|52|52 -0|53|53 -0|54|54 -0|55|55 -0|56|56 -0|57|57 -0|58|58 -0|59|59 -0|60|60 -0|61|61 -0|62|62 -0|63|63 -0|64|64 -0|65|65 -0|66|66 -0|67|67 -0|68|68 -0|69|69 -0|70|70 -0|71|71 -0|72|72 -0|73|73 -0|74|74 -0|75|75 -0|76|76 -0|77|77 -0|78|78 -0|79|79 -0|80|80 -0|81|81 -0|82|82 -0|83|83 -0|84|84 -0|85|85 -0|86|86 -0|87|87 -0|88|88 -0|89|89 -0|90|90 -0|91|91 -0|92|92 -0|93|93 -0|94|94 -0|95|95 -0|96|96 -0|97|97 -0|98|98 -0|99|99 -0|100|100 -0|101|101 -0|102|102 -0|103|103 -0|104|104 -0|105|105 -0|106|106 -0|107|107 -0|108|108 -0|109|109 -0|110|110 -0|111|111 -0|112|112 -0|113|113 -0|114|114 -0|115|115 -0|116|116 -0|117|117 -0|118|118 -0|119|119 -0|120|120 -0|121|121 -0|122|122 -0|123|123 -0|124|124 -0|125|125 -0|126|126 -0|127|127 -0|128|128 -0|129|129 -0|130|130 -0|131|131 -0|132|132 -0|133|133 -0|134|134 -0|135|135 -0|136|136 -0|137|137 -0|138|138 -0|139|139 -0|140|140 -0|141|141 -0|142|142 -0|143|143 -0|144|144 -0|145|145 -0|146|146 -0|147|147 -0|148|148 -0|149|149 -0|150|150 -0|151|151 -0|152|152 -0|153|153 -0|154|154 -0|155|155 -0|156|156 -0|157|157 -0|158|158 -0|159|159 -0|160|160 -0|161|161 -0|162|162 -0|163|163 -0|164|164 -0|165|165 -0|166|166 -0|167|167 -0|168|168 -0|169|169 -0|170|170 -0|171|171 -0|172|172 -0|173|173 -0|174|174 -0|175|175 -0|176|176 -0|177|177 -0|178|178 -0|179|179 -0|180|180 -0|181|181 -0|182|182 -0|183|183 -0|184|184 -0|185|185 -0|186|186 -0|187|187 -0|188|188 -0|189|189 -0|190|190 -0|191|191 -0|192|192 -0|193|193 -0|194|194 -0|195|195 -0|196|196 -0|197|197 -0|198|198 -0|199|199 -0|200|200 -0|201|201 -0|202|202 -0|203|203 -0|204|204 -0|205|205 -0|206|206 -0|207|207 -0|208|208 -0|209|209 -0|210|210 -0|211|211 -0|212|212 -0|213|213 -0|214|214 -0|215|215 -0|216|216 -0|217|217 -0|218|218 -0|219|219 -0|220|220 -0|221|221 -0|222|222 -0|223|223 -0|224|224 -0|225|225 -0|226|226 -0|227|227 -0|228|228 -0|229|229 -0|230|230 -0|231|231 -0|232|232 -0|233|233 -0|234|234 -0|235|235 -0|236|236 -0|237|237 -0|238|238 -0|239|239 -0|240|240 -0|241|241 -0|242|242 -0|243|243 -0|244|244 -0|245|245 -0|246|246 -0|247|247 -0|248|248 -0|249|249 -0|250|250 -0|251|251 -0|252|252 -0|253|253 -0|254|254 -0|255|255 -0|256|256 -0|257|257 -0|258|258 -0|259|259 -0|260|260 -0|261|261 -0|262|262 -0|263|263 -0|264|264 -0|265|265 -0|266|266 -0|267|267 -0|268|268 -0|269|269 -0|270|270 -0|271|271 -0|272|272 -0|273|273 -0|274|274 -0|275|275 -0|276|276 -0|277|277 -0|278|278 -0|279|279 -0|280|280 -0|281|281 -0|282|282 -0|283|283 -0|284|284 -0|285|285 -0|286|286 -0|287|287 -0|288|288 -0|289|289 -0|290|290 -0|291|291 -0|292|292 -0|293|293 -0|294|294 -0|295|295 -0|296|296 -0|297|297 -0|298|298 -0|299|299 -0|300|300 -0|301|301 -0|302|302 -0|303|303 -0|304|304 -0|305|305 -0|306|306 -0|307|307 -0|308|308 -0|309|309 -0|310|310 -0|311|311 -0|312|312 -0|313|313 -0|314|314 -0|315|315 -0|316|316 -0|317|317 -0|318|318 -0|319|319 -0|320|320 -0|321|321 -0|322|322 -0|323|323 -0|324|324 -0|325|325 -0|326|326 -0|327|327 -0|328|328 -0|329|329 -0|330|330 -0|331|331 -0|332|332 -0|333|333 -0|334|334 -0|335|335 -0|336|336 -0|337|337 -0|338|338 -0|339|339 -0|340|340 -0|341|341 -0|342|342 -0|343|343 -0|344|344 -0|345|345 -0|346|346 -0|347|347 -0|348|348 -0|349|349 -0|350|350 -0|351|351 -0|352|352 -0|353|353 -0|354|354 -0|355|355 -0|356|356 -0|357|357 -0|358|358 -0|359|359 -0|360|360 -0|361|361 -0|362|362 -0|363|363 -0|364|364 -0|365|365 -0|366|366 -0|367|367 -0|368|368 -0|369|369 -0|370|370 -0|371|371 -0|372|372 -0|373|373 -0|374|374 -0|375|375 -0|376|376 -0|377|377 -0|378|378 -0|379|379 -0|380|380 -0|381|381 -0|382|382 -0|383|383 -0|384|384 -0|385|385 -0|386|386 -0|387|387 -0|388|388 -0|389|389 -0|390|390 -0|391|391 -0|392|392 -0|393|393 -0|394|394 -0|395|395 -0|396|396 -0|397|397 -0|398|398 -0|399|399 -0|400|400 -0|401|401 -0|402|402 -0|403|403 -0|404|404 -0|405|405 -0|406|406 -0|407|407 -0|408|408 -0|409|409 -0|410|410 -0|411|411 -0|412|412 -0|413|413 -0|414|414 -0|415|415 -0|416|416 -0|417|417 -0|418|418 -0|419|419 -0|420|420 -0|421|421 -0|422|422 -0|423|423 -0|424|424 -0|425|425 -0|426|426 -0|427|427 -0|428|428 -0|429|429 -0|430|430 -0|431|431 -0|432|432 -0|433|433 -0|434|434 -0|435|435 -0|436|436 -0|437|437 -0|438|438 -0|439|439 -0|440|440 -0|441|441 -0|442|442 -0|443|443 -0|444|444 -0|445|445 -0|446|446 -0
[8/9] incubator-griffin-site git commit: streaming use case
http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/6b5057a3/data/batch/demo_basic -- diff --git a/data/batch/demo_basic b/data/batch/demo_basic new file mode 100644 index 000..464ef41 --- /dev/null +++ b/data/batch/demo_basic @@ -0,0 +1,124000 @@ +0|1|1 +0|2|2 +0|3|3 +0|4|4 +0|5|5 +0|6|6 +0|7|7 +0|8|8 +0|9|9 +0|10|10 +0|11|11 +0|12|12 +0|13|13 +0|14|14 +0|15|15 +0|16|16 +0|17|17 +0|18|18 +0|19|19 +0|20|20 +0|21|21 +0|22|22 +0|23|23 +0|24|24 +0|25|25 +0|26|26 +0|27|27 +0|28|28 +0|29|29 +0|30|30 +0|31|31 +0|32|32 +0|33|33 +0|34|34 +0|35|35 +0|36|36 +0|37|37 +0|38|38 +0|39|39 +0|40|40 +0|41|41 +0|42|42 +0|43|43 +0|44|44 +0|45|45 +0|46|46 +0|47|47 +0|48|48 +0|49|49 +0|50|50 +0|51|51 +0|52|52 +0|53|53 +0|54|54 +0|55|55 +0|56|56 +0|57|57 +0|58|58 +0|59|59 +0|60|60 +0|61|61 +0|62|62 +0|63|63 +0|64|64 +0|65|65 +0|66|66 +0|67|67 +0|68|68 +0|69|69 +0|70|70 +0|71|71 +0|72|72 +0|73|73 +0|74|74 +0|75|75 +0|76|76 +0|77|77 +0|78|78 +0|79|79 +0|80|80 +0|81|81 +0|82|82 +0|83|83 +0|84|84 +0|85|85 +0|86|86 +0|87|87 +0|88|88 +0|89|89 +0|90|90 +0|91|91 +0|92|92 +0|93|93 +0|94|94 +0|95|95 +0|96|96 +0|97|97 +0|98|98 +0|99|99 +0|100|100 +0|101|101 +0|102|102 +0|103|103 +0|104|104 +0|105|105 +0|106|106 +0|107|107 +0|108|108 +0|109|109 +0|110|110 +0|111|111 +0|112|112 +0|113|113 +0|114|114 +0|115|115 +0|116|116 +0|117|117 +0|118|118 +0|119|119 +0|120|120 +0|121|121 +0|122|122 +0|123|123 +0|124|124 +0|125|125 +0|126|126 +0|127|127 +0|128|128 +0|129|129 +0|130|130 +0|131|131 +0|132|132 +0|133|133 +0|134|134 +0|135|135 +0|136|136 +0|137|137 +0|138|138 +0|139|139 +0|140|140 +0|141|141 +0|142|142 +0|143|143 +0|144|144 +0|145|145 +0|146|146 +0|147|147 +0|148|148 +0|149|149 +0|150|150 +0|151|151 +0|152|152 +0|153|153 +0|154|154 +0|155|155 +0|156|156 +0|157|157 +0|158|158 +0|159|159 +0|160|160 +0|161|161 +0|162|162 +0|163|163 +0|164|164 +0|165|165 +0|166|166 +0|167|167 +0|168|168 +0|169|169 +0|170|170 +0|171|171 +0|172|172 +0|173|173 +0|174|174 +0|175|175 +0|176|176 +0|177|177 +0|178|178 +0|179|179 +0|180|180 +0|181|181 +0|182|182 +0|183|183 +0|184|184 +0|185|185 +0|186|186 +0|187|187 +0|188|188 +0|189|189 +0|190|190 +0|191|191 +0|192|192 +0|193|193 +0|194|194 +0|195|195 +0|196|196 +0|197|197 +0|198|198 +0|199|199 +0|200|200 +0|201|201 +0|202|202 +0|203|203 +0|204|204 +0|205|205 +0|206|206 +0|207|207 +0|208|208 +0|209|209 +0|210|210 +0|211|211 +0|212|212 +0|213|213 +0|214|214 +0|215|215 +0|216|216 +0|217|217 +0|218|218 +0|219|219 +0|220|220 +0|221|221 +0|222|222 +0|223|223 +0|224|224 +0|225|225 +0|226|226 +0|227|227 +0|228|228 +0|229|229 +0|230|230 +0|231|231 +0|232|232 +0|233|233 +0|234|234 +0|235|235 +0|236|236 +0|237|237 +0|238|238 +0|239|239 +0|240|240 +0|241|241 +0|242|242 +0|243|243 +0|244|244 +0|245|245 +0|246|246 +0|247|247 +0|248|248 +0|249|249 +0|250|250 +0|251|251 +0|252|252 +0|253|253 +0|254|254 +0|255|255 +0|256|256 +0|257|257 +0|258|258 +0|259|259 +0|260|260 +0|261|261 +0|262|262 +0|263|263 +0|264|264 +0|265|265 +0|266|266 +0|267|267 +0|268|268 +0|269|269 +0|270|270 +0|271|271 +0|272|272 +0|273|273 +0|274|274 +0|275|275 +0|276|276 +0|277|277 +0|278|278 +0|279|279 +0|280|280 +0|281|281 +0|282|282 +0|283|283 +0|284|284 +0|285|285 +0|286|286 +0|287|287 +0|288|288 +0|289|289 +0|290|290 +0|291|291 +0|292|292 +0|293|293 +0|294|294 +0|295|295 +0|296|296 +0|297|297 +0|298|298 +0|299|299 +0|300|300 +0|301|301 +0|302|302 +0|303|303 +0|304|304 +0|305|305 +0|306|306 +0|307|307 +0|308|308 +0|309|309 +0|310|310 +0|311|311 +0|312|312 +0|313|313 +0|314|314 +0|315|315 +0|316|316 +0|317|317 +0|318|318 +0|319|319 +0|320|320 +0|321|321 +0|322|322 +0|323|323 +0|324|324 +0|325|325 +0|326|326 +0|327|327 +0|328|328 +0|329|329 +0|330|330 +0|331|331 +0|332|332 +0|333|333 +0|334|334 +0|335|335 +0|336|336 +0|337|337 +0|338|338 +0|339|339 +0|340|340 +0|341|341 +0|342|342 +0|343|343 +0|344|344 +0|345|345 +0|346|346 +0|347|347 +0|348|348 +0|349|349 +0|350|350 +0|351|351 +0|352|352 +0|353|353 +0|354|354 +0|355|355 +0|356|356 +0|357|357 +0|358|358 +0|359|359 +0|360|360 +0|361|361 +0|362|362 +0|363|363 +0|364|364 +0|365|365 +0|366|366 +0|367|367 +0|368|368 +0|369|369 +0|370|370 +0|371|371 +0|372|372 +0|373|373 +0|374|374 +0|375|375 +0|376|376 +0|377|377 +0|378|378 +0|379|379 +0|380|380 +0|381|381 +0|382|382 +0|383|383 +0|384|384 +0|385|385 +0|386|386 +0|387|387 +0|388|388 +0|389|389 +0|390|390 +0|391|391 +0|392|392 +0|393|393 +0|394|394 +0|395|395 +0|396|396 +0|397|397 +0|398|398 +0|399|399 +0|400|400 +0|401|401 +0|402|402 +0|403|403 +0|404|404 +0|405|405 +0|406|406 +0|407|407 +0|408|408 +0|409|409 +0|410|410 +0|411|411 +0|412|412 +0|413|413 +0|414|414 +0|415|415 +0|416|416 +0|417|417 +0|418|418 +0|419|419 +0|420|420 +0|421|421 +0|422|422 +0|423|423 +0|424|424 +0|425|425 +0|426|426 +0|427|427 +0|428|428 +0|429|429 +0|430|430 +0|431|431 +0|432|432 +0|433|433 +0|434|434 +0|435|435 +0|436|436 +0|437|437 +0|438|438 +0|439|439 +0|440|440 +0|441|441 +0|442|442 +0|443|443 +0|444|
