Repository: incubator-madlib
Updated Branches:
  refs/heads/master 4264fa9d3 -> e6a21d94c


Release 1.12: Version numbering and upgrade related changes

Updates the version number to 1.12 for the release candidate.
Updates the changelists and other related files for upgrade.
Note that upgrade is not supported from versions prior to 1.9.1.

Closes #165


Project: http://git-wip-us.apache.org/repos/asf/incubator-madlib/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-madlib/commit/e6a21d94
Tree: http://git-wip-us.apache.org/repos/asf/incubator-madlib/tree/e6a21d94
Diff: http://git-wip-us.apache.org/repos/asf/incubator-madlib/diff/e6a21d94

Branch: refs/heads/master
Commit: e6a21d94c6e8bbaaa8b620b63b5578790a005389
Parents: 4264fa9
Author: Orhan Kislal <okis...@pivotal.io>
Authored: Fri Aug 18 16:58:25 2017 -0700
Committer: Orhan Kislal <okis...@pivotal.io>
Committed: Fri Aug 18 17:01:33 2017 -0700

----------------------------------------------------------------------
 deploy/gppkg/CMakeLists.txt             |   2 +-
 deploy/gppkg/madlib.spec.in             |   2 +-
 deploy/postflight.sh                    |   2 +-
 doc/mainpage.dox.in                     |   3 +-
 pom.xml                                 |  16 +--
 src/config/Version.yml                  |   2 +-
 src/madpack/changelist.yaml             |  55 +++++++--
 src/madpack/changelist_1.10.0_1.12.yaml |  89 ++++++++++++++
 src/madpack/changelist_1.9.1_1.11.yaml  | 137 ---------------------
 src/madpack/changelist_1.9.1_1.12.yaml  | 165 +++++++++++++++++++++++++
 src/madpack/changelist_1.9_1.11.yaml    | 175 ---------------------------
 src/madpack/upgrade_util.py             |  12 +-
 12 files changed, 312 insertions(+), 348 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-madlib/blob/e6a21d94/deploy/gppkg/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/deploy/gppkg/CMakeLists.txt b/deploy/gppkg/CMakeLists.txt
index fb2ea14..d258f3e 100644
--- a/deploy/gppkg/CMakeLists.txt
+++ b/deploy/gppkg/CMakeLists.txt
@@ -2,7 +2,7 @@
 # Packaging for Greenplum's gppkg
 # 
------------------------------------------------------------------------------
 
-set(MADLIB_GPPKG_VERSION "1.9.8")
+set(MADLIB_GPPKG_VERSION "1.9.9")
 set(MADLIB_GPPKG_RELEASE_NUMBER 1)
 set(MADLIB_GPPKG_RPM_SOURCE_DIR
     "${CMAKE_BINARY_DIR}/_CPack_Packages/Linux/RPM/${CPACK_PACKAGE_FILE_NAME}"

http://git-wip-us.apache.org/repos/asf/incubator-madlib/blob/e6a21d94/deploy/gppkg/madlib.spec.in
----------------------------------------------------------------------
diff --git a/deploy/gppkg/madlib.spec.in b/deploy/gppkg/madlib.spec.in
index 2d0833a..78fdb90 100644
--- a/deploy/gppkg/madlib.spec.in
+++ b/deploy/gppkg/madlib.spec.in
@@ -7,7 +7,7 @@
 BuildRoot:      @MADLIB_GPPKG_RPM_SOURCE_DIR@
 Summary:        Apache MADlib for @GPDB_VARIANT@ Database
 License:        @CPACK_RPM_PACKAGE_LICENSE@
-Name:           Apache_MADlib
+Name:           madlib
 Version:        @MADLIB_VERSION_STRING_NO_HYPHEN@
 Release:        @MADLIB_GPPKG_RELEASE_NUMBER@
 Group:          @CPACK_RPM_PACKAGE_GROUP@

http://git-wip-us.apache.org/repos/asf/incubator-madlib/blob/e6a21d94/deploy/postflight.sh
----------------------------------------------------------------------
diff --git a/deploy/postflight.sh b/deploy/postflight.sh
index 195c7b6..01c918b 100755
--- a/deploy/postflight.sh
+++ b/deploy/postflight.sh
@@ -2,7 +2,7 @@
 
 # $0 - Script Path, $1 - Package Path, $2 - Target Location, and $3 - Target 
Volumn
 
-MADLIB_VERSION=1.12-dev
+MADLIB_VERSION=1.12
 
 find $2/usr/local/madlib/bin -type d -exec cp -RPf {} 
$2/usr/local/madlib/old_bin \; 2>/dev/null
 find $2/usr/local/madlib/bin -depth -type d -exec rm -r {} \; 2>/dev/null

http://git-wip-us.apache.org/repos/asf/incubator-madlib/blob/e6a21d94/doc/mainpage.dox.in
----------------------------------------------------------------------
diff --git a/doc/mainpage.dox.in b/doc/mainpage.dox.in
index be45369..10c1f76 100644
--- a/doc/mainpage.dox.in
+++ b/doc/mainpage.dox.in
@@ -17,7 +17,8 @@ Useful links:
 <li><a href="https://mail-archives.apache.org/mod_mbox/madlib-user/";>User 
mailing list</a></li>
 <li><a href="https://mail-archives.apache.org/mod_mbox/madlib-dev/";>Dev 
mailing list</a></li>
 <li>User documentation for earlier releases:
-    <a href="../v1.10.0/index.html">v1.10.0</a>,
+    <a href="../v1.11/index.html">v1.11</a>,
+    <a href="../v1.10/index.html">v1.10.0</a>,
     <a href="../v1.9.1/index.html">v1.9.1</a>,
     <a href="../v1.9/index.html">v1.9</a>,
     <a href="../v1.8/index.html">v1.8</a>,

http://git-wip-us.apache.org/repos/asf/incubator-madlib/blob/e6a21d94/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 04017a3..081730e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
 
   <groupId>org.apache.madlib</groupId>
   <artifactId>madlib</artifactId>
-  <version>1.12-dev</version>
+  <version>1.12</version>
   <packaging>pom</packaging>
 
   <build>
@@ -665,20 +665,6 @@
               <exclude>src/utils/memory.hpp</exclude>
               <exclude>src/utils/Reference.hpp</exclude>
               <exclude>src/utils/shapeToExtents.hpp</exclude>
-              <exclude>src/madpack/changelist.yaml</exclude>
-
-              <!-- The following files are renamed with every release -->
-              <exclude>src/madpack/changelist_1.0_*.yaml</exclude>
-              <exclude>src/madpack/changelist_1.1_*.yaml</exclude>
-              <exclude>src/madpack/changelist_1.2_*.yaml</exclude>
-              <exclude>src/madpack/changelist_1.3_*.yaml</exclude>
-              <exclude>src/madpack/changelist_1.4.1_*.yaml</exclude>
-              <exclude>src/madpack/changelist_1.4_*.yaml</exclude>
-              <exclude>src/madpack/changelist_1.5_*.yaml</exclude>
-              <exclude>src/madpack/changelist_1.6.0S_*.yaml</exclude>
-              <exclude>src/madpack/changelist_1.6_*.yaml</exclude>
-              <exclude>src/madpack/changelist_1.7_*.yaml</exclude>
-              <exclude>src/madpack/changelist_1.7.1_*.yaml</exclude>
 
               <!-- Finally we exclude a few file types (based on extension) 
for which comments are
                    tough to maintain. Note that this is a combination of files 
licensed to ASF and

http://git-wip-us.apache.org/repos/asf/incubator-madlib/blob/e6a21d94/src/config/Version.yml
----------------------------------------------------------------------
diff --git a/src/config/Version.yml b/src/config/Version.yml
index 0db4d5b..71f85cc 100644
--- a/src/config/Version.yml
+++ b/src/config/Version.yml
@@ -1 +1 @@
-version: 1.12-dev
+version: 1.12

http://git-wip-us.apache.org/repos/asf/incubator-madlib/blob/e6a21d94/src/madpack/changelist.yaml
----------------------------------------------------------------------
diff --git a/src/madpack/changelist.yaml b/src/madpack/changelist.yaml
index 6747ee0..77edeb8 100644
--- a/src/madpack/changelist.yaml
+++ b/src/madpack/changelist.yaml
@@ -1,4 +1,23 @@
-# Changelist for MADlib version 1.10.0 to 1.11
+# 
------------------------------------------------------------------------------
+# 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.
+# 
------------------------------------------------------------------------------
+
+# Changelist for MADlib version 1.11 to 1.12
 
 # This file contains all changes that were introduced in a new version of
 # MADlib. This changelist is used by the upgrade script to detect what objects
@@ -9,12 +28,17 @@
 # file installed on the upgrade version. All other files (that don't have
 # updates), are cleaned up to remove object replacements
 new module:
-    # ----------------- Changes from 1.10.0 to 1.11 --------
-    pagerank:
+    # ----------------- Changes from 1.11 to 1.12 --------
+    mlp:
+    apsp:
+    bfs:
+    measures:
+    wcc:
+    stratified_sample:
+    train_test_split:
 # Changes in the types (UDT) including removal and modification
 udt:
 
-
 # List of the UDF changes that affect the user externally. This includes change
 # in function name, return type, argument order or types, or removal of
 # the function. In each case, the original function is as good as removed and a
@@ -22,14 +46,25 @@ udt:
 # are user views dependent on this function, since the original function will
 # not be present in the upgraded version.
 udf:
-    # ----------------- Changes from 1.10.0 to 1.11 ----------
-    - __build_tree:
+    # ----------------- Changes from 1.11 to 1.12 ----------
+    - tree_train:
+        rettype: void
+        argument: text, text, text, text, text, text, text, text, text, 
integer, integer, integer, integer, text, text, boolean
+    - tree_train:
+        rettype: void
+        argument: text, text, text, text, text, text, text, text, text, 
integer, integer, integer, integer, text, text
+    - forest_train:
         rettype: void
-        argument: boolean, text, text, text, text, text, boolean, character 
varying[], character varying[], character varying[], text, text, integer, 
integer, integer, integer, text, smallint, text, integer
-    - graph_sssp_get_path:
+        argument: text, text, text, text, text, text, text, integer, integer, 
boolean, integer, integer, integer, integer, integer, text, boolean, double 
precision
+    - forest_train:
+        rettype: void
+        argument: text, text, text, text, text, text, text, integer, integer, 
boolean, integer, integer, integer, integer, integer, text, boolean
+    - forest_train:
+        rettype: void
+        argument: text, text, text, text, text, text, text, integer, integer, 
boolean, integer, integer, integer, integer, integer, text
+    - _map_catlevel_to_int:
         rettype: integer[]
-        argument: text, integer
-
+        argument: text[], text[], integer[]
 # Changes to aggregates (UDA) including removal and modification
 # Overloaded functions should be mentioned separately
 uda:

http://git-wip-us.apache.org/repos/asf/incubator-madlib/blob/e6a21d94/src/madpack/changelist_1.10.0_1.12.yaml
----------------------------------------------------------------------
diff --git a/src/madpack/changelist_1.10.0_1.12.yaml 
b/src/madpack/changelist_1.10.0_1.12.yaml
new file mode 100644
index 0000000..3cac569
--- /dev/null
+++ b/src/madpack/changelist_1.10.0_1.12.yaml
@@ -0,0 +1,89 @@
+# 
------------------------------------------------------------------------------
+# 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.
+# 
------------------------------------------------------------------------------
+
+# Changelist for MADlib version 1.10.0 to 1.12
+
+# This file contains all changes that were introduced in a new version of
+# MADlib. This changelist is used by the upgrade script to detect what objects
+# should be upgraded (while retaining all other objects from the previous 
version)
+
+# New modules (actually .sql_in files) added in upgrade version
+# For these files the sql_in code is retained as is with the functions in the
+# file installed on the upgrade version. All other files (that don't have
+# updates), are cleaned up to remove object replacements
+new module:
+    # ----------------- Changes from 1.10.0 to 1.11 --------
+    pagerank:
+    # ----------------- Changes from 1.11 to 1.12 --------
+    mlp:
+    apsp:
+    bfs:
+    measures:
+    wcc:
+    stratified_sample:
+    train_test_split:
+# Changes in the types (UDT) including removal and modification
+udt:
+
+
+# List of the UDF changes that affect the user externally. This includes change
+# in function name, return type, argument order or types, or removal of
+# the function. In each case, the original function is as good as removed and a
+# new function is created. In such cases, we should abort the upgrade if there
+# are user views dependent on this function, since the original function will
+# not be present in the upgraded version.
+udf:
+    # ----------------- Changes from 1.10.0 to 1.11 ----------
+    - __build_tree:
+        rettype: void
+        argument: boolean, text, text, text, text, text, boolean, character 
varying[], character varying[], character varying[], text, text, integer, 
integer, integer, integer, text, smallint, text, integer
+    - graph_sssp_get_path:
+        rettype: integer[]
+        argument: text, integer
+    # ----------------- Changes from 1.11 to 1.12 ----------
+    - tree_train:
+        rettype: void
+        argument: text, text, text, text, text, text, text, text, text, 
integer, integer, integer, integer, text, text, boolean
+    - tree_train:
+        rettype: void
+        argument: text, text, text, text, text, text, text, text, text, 
integer, integer, integer, integer, text, text
+    - forest_train:
+        rettype: void
+        argument: text, text, text, text, text, text, text, integer, integer, 
boolean, integer, integer, integer, integer, integer, text, boolean, double 
precision
+    - forest_train:
+        rettype: void
+        argument: text, text, text, text, text, text, text, integer, integer, 
boolean, integer, integer, integer, integer, integer, text, boolean
+    - forest_train:
+        rettype: void
+        argument: text, text, text, text, text, text, text, integer, integer, 
boolean, integer, integer, integer, integer, integer, text
+    - _map_catlevel_to_int:
+        rettype: integer[]
+        argument: text[], text[], integer[]
+# Changes to aggregates (UDA) including removal and modification
+# Overloaded functions should be mentioned separately
+uda:
+
+# Casts (UDC) updated/removed
+udc:
+
+# Operators (UDO) removed/updated
+udo:
+
+# Operator Classes (UDOC) removed/updated
+udoc:

http://git-wip-us.apache.org/repos/asf/incubator-madlib/blob/e6a21d94/src/madpack/changelist_1.9.1_1.11.yaml
----------------------------------------------------------------------
diff --git a/src/madpack/changelist_1.9.1_1.11.yaml 
b/src/madpack/changelist_1.9.1_1.11.yaml
deleted file mode 100644
index 6e8a15c..0000000
--- a/src/madpack/changelist_1.9.1_1.11.yaml
+++ /dev/null
@@ -1,137 +0,0 @@
-# 
------------------------------------------------------------------------------
-# 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.
-# 
------------------------------------------------------------------------------
-
-# Changelist for MADlib version 1.9.1 to 1.11
-
-# This file contains all changes that were introduced in a new version of
-# MADlib. This changelist is used by the upgrade script to detect what objects
-# should be upgraded (while retaining all other objects from the previous 
version)
-
-# New modules (actually .sql_in files) added in upgrade version
-# For these files the sql_in code is retained as is with the functions in the
-# file installed on the upgrade version. All other files (that don't have
-# updates), are cleaned up to remove object replacements
-new module:
-    # ----------------- Changes from 1.9.1 to 1.10.0 ----------
-    sssp:
-    encode_categorical:
-    knn:
-    # ----------------- Changes from 1.10.0 to 1.11 --------
-    pagerank:
-# Changes in the types (UDT) including removal and modification
-udt:
-    # ----------------- Changes from 1.9.1 to 1.10.0 ----------
-    kmeans_result:
-    kmeans_state:
-
-# List of the UDF changes that affect the user externally. This includes change
-# in function name, return type, argument order or types, or removal of
-# the function. In each case, the original function is as good as removed and a
-# new function is created. In such cases, we should abort the upgrade if there
-# are user views dependent on this function, since the original function will
-# not be present in the upgraded version.
-udf:
-    # ----------------- Changes from 1.9.1 to 1.10 ----------
-    - kmeans:
-        rettype: schema_madlib.kmeans_result
-        argument: character varying, character varying, double precision[], 
character varying, character varying, integer, double precision
-    - kmeans:
-        rettype: schema_madlib.kmeans_result
-        argument: character varying, character varying, double precision[], 
character varying, character varying, integer
-    - kmeans:
-        rettype: schema_madlib.kmeans_result
-        argument: character varying, character varying, double precision[], 
character varying, character varying
-    - kmeans:
-        rettype: schema_madlib.kmeans_result
-        argument: character varying, character varying, double precision[], 
character varying
-    - kmeans:
-        rettype: schema_madlib.kmeans_result
-        argument: character varying, character varying, double precision[]
-    - kmeans:
-        rettype: schema_madlib.kmeans_result
-        argument: character varying, character varying, character varying, 
character varying, character varying, character varying, integer, double 
precision
-    - kmeans:
-        rettype: schema_madlib.kmeans_result
-        argument: character varying, character varying, character varying, 
character varying, character varying, character varying, integer
-    - kmeans:
-        rettype: schema_madlib.kmeans_result
-        argument: character varying, character varying, character varying, 
character varying, character varying, character varying
-    - kmeans:
-        rettype: schema_madlib.kmeans_result
-        argument: character varying, character varying, character varying, 
character varying, character varying
-    - kmeans:
-        rettype: schema_madlib.kmeans_result
-        argument: character varying, character varying, character varying, 
character varying
-    - kmeanspp:
-        rettype: schema_madlib.kmeans_result
-        argument: character varying, character varying, integer, character 
varying, character varying, integer, double precision, double precision
-    - kmeanspp:
-        rettype: schema_madlib.kmeans_result
-        argument: character varying, character varying, integer, character 
varying, character varying, integer, double precision
-    - kmeanspp:
-        rettype: schema_madlib.kmeans_result
-        argument: character varying, character varying, integer, character 
varying, character varying, integer
-    - kmeanspp:
-        rettype: schema_madlib.kmeans_result
-        argument: character varying, character varying, integer, character 
varying, character varying
-    - kmeanspp:
-        rettype: schema_madlib.kmeans_result
-        argument: character varying, character varying, integer, character 
varying
-    - kmeanspp:
-        rettype: schema_madlib.kmeans_result
-        argument: character varying, character varying, integer
-    - kmeans_random:
-        rettype: schema_madlib.kmeans_result
-        argument: character varying, character varying, integer, character 
varying, character varying, integer, double precision
-    - kmeans_random:
-        rettype: schema_madlib.kmeans_result
-        argument: character varying, character varying, integer, character 
varying, character varying, integer
-    - kmeans_random:
-        rettype: schema_madlib.kmeans_result
-        argument: character varying, character varying, integer, character 
varying, character varying
-    - kmeans_random:
-        rettype: schema_madlib.kmeans_result
-        argument: character varying, character varying, integer, character 
varying
-    - kmeans_random:
-        rettype: schema_madlib.kmeans_result
-        argument: character varying, character varying, integer
-    - internal_execute_using_kmeans_args:
-        rettype: schema_madlib.kmeans_result
-        argument: character varying, character varying, character varying, 
character varying, character varying, integer, double precision
-    # ----------------- Changes from 1.10.0 to 1.11 ----------
-    - __build_tree:
-        rettype: void
-        argument: boolean, text, text, text, text, text, boolean, character 
varying[], character varying[], character varying[], text, text, integer, 
integer, integer, integer, text, smallint, text, integer
-    - graph_sssp_get_path:
-        rettype: integer[]
-        argument: text, integer
-
-
-# Changes to aggregates (UDA) including removal and modification
-# Overloaded functions should be mentioned separately
-uda:
-
-# Casts (UDC) updated/removed
-udc:
-
-# Operators (UDO) removed/updated
-udo:
-
-# Operator Classes (UDOC) removed/updated
-udoc:

http://git-wip-us.apache.org/repos/asf/incubator-madlib/blob/e6a21d94/src/madpack/changelist_1.9.1_1.12.yaml
----------------------------------------------------------------------
diff --git a/src/madpack/changelist_1.9.1_1.12.yaml 
b/src/madpack/changelist_1.9.1_1.12.yaml
new file mode 100644
index 0000000..5ba331a
--- /dev/null
+++ b/src/madpack/changelist_1.9.1_1.12.yaml
@@ -0,0 +1,165 @@
+# 
------------------------------------------------------------------------------
+# 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.
+# 
------------------------------------------------------------------------------
+
+# Changelist for MADlib version 1.9.1 to 1.12
+
+# This file contains all changes that were introduced in a new version of
+# MADlib. This changelist is used by the upgrade script to detect what objects
+# should be upgraded (while retaining all other objects from the previous 
version)
+
+# New modules (actually .sql_in files) added in upgrade version
+# For these files the sql_in code is retained as is with the functions in the
+# file installed on the upgrade version. All other files (that don't have
+# updates), are cleaned up to remove object replacements
+new module:
+    # ----------------- Changes from 1.9.1 to 1.10.0 ----------
+    sssp:
+    encode_categorical:
+    knn:
+    # ----------------- Changes from 1.10.0 to 1.11 --------
+    pagerank:
+    # ----------------- Changes from 1.11 to 1.12 --------
+    mlp:
+    apsp:
+    bfs:
+    measures:
+    wcc:
+    stratified_sample:
+    train_test_split:
+# Changes in the types (UDT) including removal and modification
+udt:
+
+    # ----------------- Changes from 1.9.1 to 1.10.0 ----------
+    kmeans_result:
+    kmeans_state:
+
+# List of the UDF changes that affect the user externally. This includes change
+# in function name, return type, argument order or types, or removal of
+# the function. In each case, the original function is as good as removed and a
+# new function is created. In such cases, we should abort the upgrade if there
+# are user views dependent on this function, since the original function will
+# not be present in the upgraded version.
+udf:
+
+    # ----------------- Changes from 1.9.1 to 1.10.0 ----------
+    - kmeans:
+        rettype: schema_madlib.kmeans_result
+        argument: character varying, character varying, double precision[], 
character varying, character varying, integer, double precision
+    - kmeans:
+        rettype: schema_madlib.kmeans_result
+        argument: character varying, character varying, double precision[], 
character varying, character varying, integer
+    - kmeans:
+        rettype: schema_madlib.kmeans_result
+        argument: character varying, character varying, double precision[], 
character varying, character varying
+    - kmeans:
+        rettype: schema_madlib.kmeans_result
+        argument: character varying, character varying, double precision[], 
character varying
+    - kmeans:
+        rettype: schema_madlib.kmeans_result
+        argument: character varying, character varying, double precision[]
+    - kmeans:
+        rettype: schema_madlib.kmeans_result
+        argument: character varying, character varying, character varying, 
character varying, character varying, character varying, integer, double 
precision
+    - kmeans:
+        rettype: schema_madlib.kmeans_result
+        argument: character varying, character varying, character varying, 
character varying, character varying, character varying, integer
+    - kmeans:
+        rettype: schema_madlib.kmeans_result
+        argument: character varying, character varying, character varying, 
character varying, character varying, character varying
+    - kmeans:
+        rettype: schema_madlib.kmeans_result
+        argument: character varying, character varying, character varying, 
character varying, character varying
+    - kmeans:
+        rettype: schema_madlib.kmeans_result
+        argument: character varying, character varying, character varying, 
character varying
+    - kmeanspp:
+        rettype: schema_madlib.kmeans_result
+        argument: character varying, character varying, integer, character 
varying, character varying, integer, double precision, double precision
+    - kmeanspp:
+        rettype: schema_madlib.kmeans_result
+        argument: character varying, character varying, integer, character 
varying, character varying, integer, double precision
+    - kmeanspp:
+        rettype: schema_madlib.kmeans_result
+        argument: character varying, character varying, integer, character 
varying, character varying, integer
+    - kmeanspp:
+        rettype: schema_madlib.kmeans_result
+        argument: character varying, character varying, integer, character 
varying, character varying
+    - kmeanspp:
+        rettype: schema_madlib.kmeans_result
+        argument: character varying, character varying, integer, character 
varying
+    - kmeanspp:
+        rettype: schema_madlib.kmeans_result
+        argument: character varying, character varying, integer
+    - kmeans_random:
+        rettype: schema_madlib.kmeans_result
+        argument: character varying, character varying, integer, character 
varying, character varying, integer, double precision
+    - kmeans_random:
+        rettype: schema_madlib.kmeans_result
+        argument: character varying, character varying, integer, character 
varying, character varying, integer
+    - kmeans_random:
+        rettype: schema_madlib.kmeans_result
+        argument: character varying, character varying, integer, character 
varying, character varying
+    - kmeans_random:
+        rettype: schema_madlib.kmeans_result
+        argument: character varying, character varying, integer, character 
varying
+    - kmeans_random:
+        rettype: schema_madlib.kmeans_result
+        argument: character varying, character varying, integer
+    - internal_execute_using_kmeans_args:
+        rettype: schema_madlib.kmeans_result
+        argument: character varying, character varying, character varying, 
character varying, character varying, integer, double precision
+    # ----------------- Changes from 1.10.0 to 1.11 ----------
+    - __build_tree:
+        rettype: void
+        argument: boolean, text, text, text, text, text, boolean, character 
varying[], character varying[], character varying[], text, text, integer, 
integer, integer, integer, text, smallint, text, integer
+    - graph_sssp_get_path:
+        rettype: integer[]
+        argument: text, integer
+    # ----------------- Changes from 1.11 to 1.12 ----------
+    - tree_train:
+        rettype: void
+        argument: text, text, text, text, text, text, text, text, text, 
integer, integer, integer, integer, text, text, boolean
+    - tree_train:
+        rettype: void
+        argument: text, text, text, text, text, text, text, text, text, 
integer, integer, integer, integer, text, text
+    - forest_train:
+        rettype: void
+        argument: text, text, text, text, text, text, text, integer, integer, 
boolean, integer, integer, integer, integer, integer, text, boolean, double 
precision
+    - forest_train:
+        rettype: void
+        argument: text, text, text, text, text, text, text, integer, integer, 
boolean, integer, integer, integer, integer, integer, text, boolean
+    - forest_train:
+        rettype: void
+        argument: text, text, text, text, text, text, text, integer, integer, 
boolean, integer, integer, integer, integer, integer, text
+    - _map_catlevel_to_int:
+        rettype: integer[]
+        argument: text[], text[], integer[]
+
+# Changes to aggregates (UDA) including removal and modification
+# Overloaded functions should be mentioned separately
+uda:
+
+# Casts (UDC) updated/removed
+udc:
+
+# Operators (UDO) removed/updated
+udo:
+
+# Operator Classes (UDOC) removed/updated
+udoc:

http://git-wip-us.apache.org/repos/asf/incubator-madlib/blob/e6a21d94/src/madpack/changelist_1.9_1.11.yaml
----------------------------------------------------------------------
diff --git a/src/madpack/changelist_1.9_1.11.yaml 
b/src/madpack/changelist_1.9_1.11.yaml
deleted file mode 100644
index 2c9647f..0000000
--- a/src/madpack/changelist_1.9_1.11.yaml
+++ /dev/null
@@ -1,175 +0,0 @@
-# 
------------------------------------------------------------------------------
-# 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.
-# 
------------------------------------------------------------------------------
-
-# Changelist for MADlib version 1.9 to 1.11
-
-# This file contains all changes that were introduced in a new version of
-# MADlib. This changelist is used by the upgrade script to detect what objects
-# should be upgraded (while retaining all other objects from the previous 
version)
-
-# New modules (actually .sql_in files) added in upgrade version
-# For these files the sql_in code is retained as is with the functions in the
-# file installed on the upgrade version. All other files (that don't have
-# updates), are cleaned up to remove object replacements
-new module:
-    # ----------------- Changes from 1.9.1 to 1.10.0 ----------
-    sssp:
-    encode_categorical:
-    knn:
-    # ----------------- Changes from 1.10.0 to 1.11 --------
-    pagerank:
-# Changes in the types (UDT) including removal and modification
-udt:
-    # ----------------- Changes from 1.9 to 1.9.1 ----------
-    profile_result:
-    # ----------------- Changes from 1.9.1 to 1.10.0 ----------
-    kmeans_result:
-    kmeans_state:
-
-# List of the UDF changes that affect the user externally. This includes change
-# in function name, return type, argument order or types, or removal of
-# the function. In each case, the original function is as good as removed and a
-# new function is created. In such cases, we should abort the upgrade if there
-# are user views dependent on this function, since the original function will
-# not be present in the upgraded version.
-udf:
-    # ----------------- Changes from 1.9 to 1.9.1 ----------
-    - array_collapse:
-        rettype: anyarray
-        argument: anyarray
-    - linear_svm_igd_transition:
-        rettype: double precision[]
-        argument: double precision[], double precision[], double precision, 
double precision[], integer, double precision, double precision, boolean, 
integer, double precision, boolean
-    - profile:
-        rettype: SETOF schema_madlib.profile_result
-        argument: text
-    - profile_full:
-        rettype: SETOF schema_madlib.profile_result
-        argument: text, integer
-    - profile:
-        rettype: schema_madlib.profile_result
-        argument: text
-    - profile_full:
-        rettype: schema_madlib.profile_result
-        argument: text, integer
-    - quantile:
-        rettype: double precision
-        argument: text, text, double precision
-    - quantile_big:
-        rettype: double precision
-        argument: text, text, double precision
-    # ----------------- Changes from 1.9.1 to 1.10.0 ----------
-    - kmeans:
-        rettype: schema_madlib.kmeans_result
-        argument: character varying, character varying, double precision[], 
character varying, character varying, integer, double precision
-    - kmeans:
-        rettype: schema_madlib.kmeans_result
-        argument: character varying, character varying, double precision[], 
character varying, character varying, integer
-    - kmeans:
-        rettype: schema_madlib.kmeans_result
-        argument: character varying, character varying, double precision[], 
character varying, character varying
-    - kmeans:
-        rettype: schema_madlib.kmeans_result
-        argument: character varying, character varying, double precision[], 
character varying
-    - kmeans:
-        rettype: schema_madlib.kmeans_result
-        argument: character varying, character varying, double precision[]
-    - kmeans:
-        rettype: schema_madlib.kmeans_result
-        argument: character varying, character varying, character varying, 
character varying, character varying, character varying, integer, double 
precision
-    - kmeans:
-        rettype: schema_madlib.kmeans_result
-        argument: character varying, character varying, character varying, 
character varying, character varying, character varying, integer
-    - kmeans:
-        rettype: schema_madlib.kmeans_result
-        argument: character varying, character varying, character varying, 
character varying, character varying, character varying
-    - kmeans:
-        rettype: schema_madlib.kmeans_result
-        argument: character varying, character varying, character varying, 
character varying, character varying
-    - kmeans:
-        rettype: schema_madlib.kmeans_result
-        argument: character varying, character varying, character varying, 
character varying
-    - kmeanspp:
-        rettype: schema_madlib.kmeans_result
-        argument: character varying, character varying, integer, character 
varying, character varying, integer, double precision, double precision
-    - kmeanspp:
-        rettype: schema_madlib.kmeans_result
-        argument: character varying, character varying, integer, character 
varying, character varying, integer, double precision
-    - kmeanspp:
-        rettype: schema_madlib.kmeans_result
-        argument: character varying, character varying, integer, character 
varying, character varying, integer
-    - kmeanspp:
-        rettype: schema_madlib.kmeans_result
-        argument: character varying, character varying, integer, character 
varying, character varying
-    - kmeanspp:
-        rettype: schema_madlib.kmeans_result
-        argument: character varying, character varying, integer, character 
varying
-    - kmeanspp:
-        rettype: schema_madlib.kmeans_result
-        argument: character varying, character varying, integer
-    - kmeans_random:
-        rettype: schema_madlib.kmeans_result
-        argument: character varying, character varying, integer, character 
varying, character varying, integer, double precision
-    - kmeans_random:
-        rettype: schema_madlib.kmeans_result
-        argument: character varying, character varying, integer, character 
varying, character varying, integer
-    - kmeans_random:
-        rettype: schema_madlib.kmeans_result
-        argument: character varying, character varying, integer, character 
varying, character varying
-    - kmeans_random:
-        rettype: schema_madlib.kmeans_result
-        argument: character varying, character varying, integer, character 
varying
-    - kmeans_random:
-        rettype: schema_madlib.kmeans_result
-        argument: character varying, character varying, integer
-    - internal_execute_using_kmeans_args:
-        rettype: schema_madlib.kmeans_result
-        argument: character varying, character varying, character varying, 
character varying, character varying, integer, double precision
-    # ----------------- Changes from 1.10.0 to 1.11 ----------
-    - __build_tree:
-        rettype: void
-        argument: boolean, text, text, text, text, text, boolean, character 
varying[], character varying[], character varying[], text, text, integer, 
integer, integer, integer, text, smallint, text, integer
-    - graph_sssp_get_path:
-        rettype: integer[]
-        argument: text, integer
-
-
-# Changes to aggregates (UDA) including removal and modification
-# Overloaded functions should be mentioned separately
-uda:
-    # ----------------- Changes from 1.9 to 1.9.1 ----------
-    - array_agg:
-        rettype: anyarray
-        argument: anyelement
-    - linear_svm_igd_step:
-       rettype: double precision[]
-       argument: double precision[], double precision, double precision[], 
integer, double precision, double precision, boolean, integer, double 
precision, boolean
-
-
-# Casts (UDC) updated/removed
-udc:
-    # ----------------- Changes from 1.9 to 1.9.1 ----------
-
-# Operators (UDO) removed/updated
-udo:
-    # ----------------- Changes from 1.9 to 1.9.1 ----------
-
-# Operator Classes (UDOC) removed/updated
-udoc:
-    # ----------------- Changes from 1.9 to 1.9.1 ----------

http://git-wip-us.apache.org/repos/asf/incubator-madlib/blob/e6a21d94/src/madpack/upgrade_util.py
----------------------------------------------------------------------
diff --git a/src/madpack/upgrade_util.py b/src/madpack/upgrade_util.py
index 0ecf86d..68286c0 100644
--- a/src/madpack/upgrade_util.py
+++ b/src/madpack/upgrade_util.py
@@ -141,15 +141,15 @@ class ChangeHandler(UpgradeBase):
         @brief Load the configuration file
         """
 
-        # _mad_dbrev = 1.9
-        if self._mad_dbrev.split('.') < '1.9.1'.split('.'):
-            filename = os.path.join(self._maddir, 'madpack',
-                                    'changelist_1.9_1.11.yaml')
         # _mad_dbrev = 1.9.1
-        elif self._mad_dbrev.split('.') < '1.10.0'.split('.'):
+        if self._mad_dbrev.split('.') < '1.10.0'.split('.'):
             filename = os.path.join(self._maddir, 'madpack',
-                                    'changelist_1.9.1_1.11.yaml')
+                                    'changelist_1.9.1_1.12.yaml')
         # _mad_dbrev = 1.10.0
+        elif self._mad_dbrev.split('.') < '1.11'.split('.'):
+            filename = os.path.join(self._maddir, 'madpack',
+                                    'changelist_1.10.0_1.12.yaml')
+        # _mad_dbrev = 1.11
         else:
             filename = os.path.join(self._maddir, 'madpack',
                                     'changelist.yaml')


Reply via email to