You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@madlib.apache.org by ri...@apache.org on 2017/01/13 18:45:27 UTC
[1/2] incubator-madlib git commit: Build: Update madpack versioning
to include _ and +
Repository: incubator-madlib
Updated Branches:
refs/heads/master 3cf3f6771 -> e0439ed8d
Build: Update madpack versioning to include _ and +
Project: http://git-wip-us.apache.org/repos/asf/incubator-madlib/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-madlib/commit/c564e31d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-madlib/tree/c564e31d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-madlib/diff/c564e31d
Branch: refs/heads/master
Commit: c564e31d70c0848cc2a2786dca5c6f1a90c2f20f
Parents: 3cf3f67
Author: Rahul Iyer <ri...@apache.org>
Authored: Thu Jan 12 12:08:37 2017 -0800
Committer: Rahul Iyer <ri...@apache.org>
Committed: Thu Jan 12 12:08:37 2017 -0800
----------------------------------------------------------------------
RELEASE_NOTES | 3 +--
ReadMe.txt | 4 ++--
deploy/PGXN/META.json.in | 8 ++++----
deploy/gppkg/gppkg_spec.yml.in | 2 +-
deploy/hawq_install.sh | 2 +-
doc/etc/header.html | 4 ++--
src/madpack/madpack.py | 30 ++++++++++++++++-------------
src/modules/stats/chi_squared_test.cpp | 3 +--
8 files changed, 29 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-madlib/blob/c564e31d/RELEASE_NOTES
----------------------------------------------------------------------
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index 420c421..6eb5c22 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -7,8 +7,7 @@ with most recent versions listed at the top.
A complete list of changes for each release can be obtained by viewing the git
commit history located at https://github.com/madlib/madlib/commits/master.
-Current list of bugs and issues can be found at http://jira.madlib.net.
-
+Current list of bugs and issues can be found at https://issues.apache.org/jira/browse/MADLIB.
\u2014-------------------------------------------------------------------------
MADlib v1.9.1
http://git-wip-us.apache.org/repos/asf/incubator-madlib/blob/c564e31d/ReadMe.txt
----------------------------------------------------------------------
diff --git a/ReadMe.txt b/ReadMe.txt
index 3b1a0e0..2116d7f 100644
--- a/ReadMe.txt
+++ b/ReadMe.txt
@@ -5,13 +5,13 @@ MADlib is an open-source library for scalable in-database analytics.
It provides data-parallel implementations of mathematical, statistical
and machine learning methods for structured and unstructured data.
-See the project web site located at http://madlib.net for links to the latest
+See the project web site located at http://madlib.incubator.apache.org/ for links to the latest
binary and source packages.
For installation and contribution guides, please see the MADlib wiki at
https://github.com/madlib/madlib/wiki.
-The latest documentation of MADlib modules can be found at http://doc.madlib.net
+The latest documentation of MADlib modules can be found at http://madlib.incubator.apache.org/docs
or can be accessed directly from the MADlib installation directory by opening
doc/user/html/index.html.
http://git-wip-us.apache.org/repos/asf/incubator-madlib/blob/c564e31d/deploy/PGXN/META.json.in
----------------------------------------------------------------------
diff --git a/deploy/PGXN/META.json.in b/deploy/PGXN/META.json.in
index 0e027eb..47dd9cb 100644
--- a/deploy/PGXN/META.json.in
+++ b/deploy/PGXN/META.json.in
@@ -13,13 +13,13 @@
}
},
"resources": {
- "homepage": "http://madlib.net/",
+ "homepage": "http://madlib.incubator.apache.org/",
"bugtracker": {
- "web": "http://jira.madlib.net/"
+ "web": "https://issues.apache.org/jira/browse/MADLIB/"
},
"repository": {
- "url": "https://github.com/madlib/madlib.git",
- "web": "https://github.com/madlib/madlib",
+ "url": "https://github.com/apache/incubator-madlib.git",
+ "web": "https://github.com/apache/incubator-madlib",
"type": "git"
}
},
http://git-wip-us.apache.org/repos/asf/incubator-madlib/blob/c564e31d/deploy/gppkg/gppkg_spec.yml.in
----------------------------------------------------------------------
diff --git a/deploy/gppkg/gppkg_spec.yml.in b/deploy/gppkg/gppkg_spec.yml.in
index 6ecf6c5..1212a75 100644
--- a/deploy/gppkg/gppkg_spec.yml.in
+++ b/deploy/gppkg/gppkg_spec.yml.in
@@ -16,4 +16,4 @@ PostInstall:
echo ' instead of \"install\" ';
echo 'For additional options run:';
echo '$ madpack --help';
- echo 'Release notes and additional documentation can be found at http://madlib.net';"
+ echo 'Release notes and additional documentation can be found at http://madlib.incubator.apache.org';"
http://git-wip-us.apache.org/repos/asf/incubator-madlib/blob/c564e31d/deploy/hawq_install.sh
----------------------------------------------------------------------
diff --git a/deploy/hawq_install.sh b/deploy/hawq_install.sh
index 23220e1..3ac7985 100755
--- a/deploy/hawq_install.sh
+++ b/deploy/hawq_install.sh
@@ -195,5 +195,5 @@ echo " This will install MADlib objects into a Greenplum database named \
echo " running on server \"mdw\" on port 5432. Installer will try to login as \"gpadmin\""
echo " and will prompt for password. The target schema will be \"madlib\"."
echo "For additional options run: madpack --help"
-echo "Release notes and additional documentation can be found at http://madlib.net"
+echo "Release notes and additional documentation can be found at http://madlib.incubator.apache.org/"
http://git-wip-us.apache.org/repos/asf/incubator-madlib/blob/c564e31d/doc/etc/header.html
----------------------------------------------------------------------
diff --git a/doc/etc/header.html b/doc/etc/header.html
index c9b93b7..679bfca 100644
--- a/doc/etc/header.html
+++ b/doc/etc/header.html
@@ -27,7 +27,7 @@ $extrastylesheet
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
- ga('create', 'UA-45382226-1', 'madlib.net');
+ ga('create', 'UA-45382226-1', 'madlib.incubator.apache.org');
ga('send', 'pageview');
</script>
@@ -41,7 +41,7 @@ $extrastylesheet
<tbody>
<tr style="height: 56px;">
<!--BEGIN PROJECT_LOGO-->
- <td id="projectlogo"><a href="http://madlib.net"><img alt="Logo" src="$relpath^$projectlogo" height="50" style="padding-left:0.5em;" border="0"/ ></a></td>
+ <td id="projectlogo"><a href="http://madlib.incubator.apache.org"><img alt="Logo" src="$relpath^$projectlogo" height="50" style="padding-left:0.5em;" border="0"/ ></a></td>
<!--END PROJECT_LOGO-->
<!--BEGIN PROJECT_NAME-->
<td style="padding-left: 0.5em;">
http://git-wip-us.apache.org/repos/asf/incubator-madlib/blob/c564e31d/src/madpack/madpack.py
----------------------------------------------------------------------
diff --git a/src/madpack/madpack.py b/src/madpack/madpack.py
index 732eabd..e08c1c0 100755
--- a/src/madpack/madpack.py
+++ b/src/madpack/madpack.py
@@ -26,8 +26,8 @@ py_min_ver = [2, 6]
# Check python version
if sys.version_info[:2] < py_min_ver:
- print "ERROR: python version too old (%s). You need %s or greater." \
- % ('.'.join(str(i) for i in sys.version_info[:3]), '.'.join(str(i) for i in py_min_ver))
+ print("ERROR: python version too old (%s). You need %s or greater." %
+ ('.'.join(str(i) for i in sys.version_info[:3]), '.'.join(str(i) for i in py_min_ver)))
exit(1)
# Find MADlib root directory. This file is installed to
@@ -417,21 +417,19 @@ def _get_rev_num(rev):
Valid inputs:
1.9.0, 1.10.0, 2.5.0
1.0.0-alpha, 1.0.0-alpha.1, 1.0.0-0.3.7, 1.0.0-x.7.z.92
-
+ 1.0.0+20130313144700, 1.0.0-beta+exp.sha.5114f85
"""
try:
- rev_parts = rev.split('-') # text to the right of - is treated as single str
+ rev_parts = re.split('[-+_]', rev)
# get numeric part of the version string
num = [int(i) for i in rev_parts[0].split('.')]
num += [0] * (3 - len(num)) # normalize num to be of length 3
# get identifier part of the version string
if len(rev_parts) > 1:
- num.append(str(rev_parts[1]))
-
- if num:
- return num
- else:
- return [0]
+ num.extend(map(str, rev_parts[1:]))
+ if not num:
+ num = [0]
+ return num
except:
# invalid revision
return [0]
@@ -653,7 +651,7 @@ def _db_upgrade(schema, dbrev):
_info("""Dependency on 'linregr_result' could be due to objects
created from the output of the aggregate 'linregr'.
Please refer to the Linear Regression documentation
- <http://doc.madlib.net/latest/group__grp__linreg.html#warning>
+ <http://madlib.incubator.apache.org/docs/latest/group__grp__linreg.html#warning>
for the recommended solution.
""", False)
abort = True
@@ -1443,7 +1441,10 @@ class RevTest(unittest.TestCase):
self.assertTrue(_get_rev_num('4.3.10') >= _get_rev_num('4.3.5'))
self.assertTrue(_get_rev_num('1.9.10-dev') >= _get_rev_num('1.9.9'))
self.assertNotEqual(_get_rev_num('1.9.10-dev'), _get_rev_num('1.9.10'))
- self.assertEqual(_get_rev_num('1.9.10'), _get_rev_num('1.9.10'))
+ self.assertEqual(_get_rev_num('1.9.10'), [1, 9, 10])
+ self.assertEqual(_get_rev_num('1.0.0+20130313144700'), [1, 0, 0, '20130313144700'])
+ self.assertNotEqual(_get_rev_num('1.0.0+20130313144700'),
+ _get_rev_num('1.0.0-beta+exp.sha.5114f85'))
def test_is_rev_gte(self):
# 1.0.0-alpha < 1.0.0-alpha.1 < 1.0.0-alpha.beta <
@@ -1457,7 +1458,7 @@ class RevTest(unittest.TestCase):
self.assertTrue(_is_rev_gte(_get_rev_num('1.9.1'), _get_rev_num('1.9.0')))
self.assertTrue(_is_rev_gte(_get_rev_num('1.9.1'), _get_rev_num('1.9')))
self.assertTrue(_is_rev_gte(_get_rev_num('1.9.0'), _get_rev_num('1.9.0-dev')))
- self.assertTrue(_is_rev_gte(_get_rev_num('1.9.1'), _get_rev_num('1.9.0-dev')))
+ self.assertTrue(_is_rev_gte(_get_rev_num('1.9.1'), _get_rev_num('1.9-dev')))
self.assertTrue(_is_rev_gte(_get_rev_num('1.9.0-dev'), _get_rev_num('1.9.0-dev')))
self.assertTrue(_is_rev_gte([1, 9, 'rc', 1], [1, 9, 'dev', 0]))
@@ -1472,6 +1473,9 @@ class RevTest(unittest.TestCase):
self.assertFalse(_is_rev_gte([1, 9, '0.2'], [1, 9, '0.3']))
self.assertFalse(_is_rev_gte([1, 9, 'build2'], [1, 9, 'build3']))
+ self.assertFalse(_is_rev_gte(_get_rev_num('1.0.0+20130313144700'),
+ _get_rev_num('1.0.0-beta+exp.sha.5114f85')))
+
# ------------------------------------------------------------------------------
# Start Here
http://git-wip-us.apache.org/repos/asf/incubator-madlib/blob/c564e31d/src/modules/stats/chi_squared_test.cpp
----------------------------------------------------------------------
diff --git a/src/modules/stats/chi_squared_test.cpp b/src/modules/stats/chi_squared_test.cpp
index e6c8105..f87f9b9 100644
--- a/src/modules/stats/chi_squared_test.cpp
+++ b/src/modules/stats/chi_squared_test.cpp
@@ -67,7 +67,6 @@ updateSumSquaredDeviations(double &ioLeftNumRows, double &ioLeftSumExp,
return;
// FIXME: Use compensated sums for numerical stability
- // http://jira.madlib.net/browse/MADLIB-501
ioLeftSumSquaredDeviations
+= inRightSumSquaredDeviations
+ ioLeftSumExp * inRightSumObsSquareOverExp
@@ -98,7 +97,7 @@ chi2_gof_test_transition::run(AnyType &args) {
if (observed < 0)
throw std::invalid_argument("Number of observations must be "
"nonnegative.");
- else if (expected < 0)
+ else if (expected < 0)
throw std::invalid_argument("Value of expected (count or probability) "
"must be nonnegative.");
else if (df < 0)
[2/2] incubator-madlib git commit: Madpack: Disable psqlrc when
executing queries
Posted by ri...@apache.org.
Madpack: Disable psqlrc when executing queries
JIRA: MADLIB-1053
Project: http://git-wip-us.apache.org/repos/asf/incubator-madlib/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-madlib/commit/e0439ed8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-madlib/tree/e0439ed8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-madlib/diff/e0439ed8
Branch: refs/heads/master
Commit: e0439ed8d715c4a72dfbf2e450f7467925bf8784
Parents: c564e31
Author: Rahul Iyer <ri...@apache.org>
Authored: Fri Jan 13 10:37:22 2017 -0800
Committer: Rahul Iyer <ri...@apache.org>
Committed: Fri Jan 13 10:37:22 2017 -0800
----------------------------------------------------------------------
src/madpack/madpack.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-madlib/blob/e0439ed8/src/madpack/madpack.py
----------------------------------------------------------------------
diff --git a/src/madpack/madpack.py b/src/madpack/madpack.py
index e08c1c0..6348899 100755
--- a/src/madpack/madpack.py
+++ b/src/madpack/madpack.py
@@ -127,11 +127,13 @@ def run_query(sql, show_error, con_args=con_args):
'-U', con_args['user'],
'-F', delimiter,
'--no-password',
- '-Ac', "set CLIENT_MIN_MESSAGES=error; " + sql]
+ '--no-psqlrc',
+ '--no-align',
+ '-c', sql]
runenv = os.environ
if 'password' in con_args:
runenv["PGPASSWORD"] = con_args['password']
- runenv["PGOPTIONS"] = '-c search_path=public -c client_min_messages=notice'
+ runenv["PGOPTIONS"] = '-c search_path=public -c client_min_messages=error'
std, err = subprocess.Popen(runcmd, env=runenv, stdout=subprocess.PIPE,
stderr=subprocess.PIPE).communicate()