Repository: madlib
Updated Branches:
  refs/heads/master 5a1fbe01d -> 03e82bc50


Build: Remove primary key constraint in IC/DC

Some of the install-check/dev-check tests were setting primary key
constraints. If the user sets the GUC
gp_default_storage_options='appendonly=true', IC/DC will fail while
table creation because appendonly tables don't support primary key. This
commit removes these constrains since they are unnecessary for those
test cases.

Co-authored-by: Nikhil Kak <[email protected]>

Closes #323


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

Branch: refs/heads/master
Commit: d7d54b97d7cece2d58730375fa65f6bc1cc0e1c8
Parents: 5a1fbe0
Author: Jingyi Mei <[email protected]>
Authored: Mon Sep 24 11:48:51 2018 -0700
Committer: Jingyi Mei <[email protected]>
Committed: Wed Sep 26 14:02:13 2018 -0700

----------------------------------------------------------------------
 src/ports/postgres/modules/kmeans/test/kmeans.sql_in             | 3 +--
 src/ports/postgres/modules/regress/test/linear.ic.sql_in         | 1 -
 src/ports/postgres/modules/regress/test/linear.sql_in            | 3 ---
 src/ports/postgres/modules/regress/test/logistic.ic.sql_in       | 1 -
 src/ports/postgres/modules/regress/test/logistic.sql_in          | 3 ---
 src/ports/postgres/modules/regress/test/marginal.ic.sql_in       | 1 -
 src/ports/postgres/modules/regress/test/marginal.sql_in          | 1 -
 src/ports/postgres/modules/regress/test/multilogistic.ic.sql_in  | 1 -
 src/ports/postgres/modules/regress/test/multilogistic.sql_in     | 3 ---
 src/ports/postgres/modules/regress/test/robust.ic.sql_in         | 1 -
 src/ports/postgres/modules/regress/test/robust.sql_in            | 2 --
 src/ports/postgres/modules/stats/test/cox_prop_hazards.ic.sql_in | 1 -
 src/ports/postgres/modules/stats/test/cox_prop_hazards.sql_in    | 2 --
 13 files changed, 1 insertion(+), 22 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/madlib/blob/d7d54b97/src/ports/postgres/modules/kmeans/test/kmeans.sql_in
----------------------------------------------------------------------
diff --git a/src/ports/postgres/modules/kmeans/test/kmeans.sql_in 
b/src/ports/postgres/modules/kmeans/test/kmeans.sql_in
index b91998f..8d790fa 100644
--- a/src/ports/postgres/modules/kmeans/test/kmeans.sql_in
+++ b/src/ports/postgres/modules/kmeans/test/kmeans.sql_in
@@ -9,8 +9,7 @@ CREATE TABLE kmeans_2d(
        id SERIAL,
        x DOUBLE PRECISION,
        y DOUBLE PRECISION,
-       position DOUBLE PRECISION[],
-  PRIMARY KEY (id)
+       position DOUBLE PRECISION[]
 ) m4_ifdef(`__POSTGRESQL__', `', `DISTRIBUTED BY (id)');
 
 INSERT INTO kmeans_2d(x, y, position)

http://git-wip-us.apache.org/repos/asf/madlib/blob/d7d54b97/src/ports/postgres/modules/regress/test/linear.ic.sql_in
----------------------------------------------------------------------
diff --git a/src/ports/postgres/modules/regress/test/linear.ic.sql_in 
b/src/ports/postgres/modules/regress/test/linear.ic.sql_in
index 4fb5398..e1945dc 100644
--- a/src/ports/postgres/modules/regress/test/linear.ic.sql_in
+++ b/src/ports/postgres/modules/regress/test/linear.ic.sql_in
@@ -35,7 +35,6 @@ CREATE TABLE weibull (
     x1 DOUBLE PRECISION,
     x2 DOUBLE PRECISION,
     y DOUBLE PRECISION
-    , CONSTRAINT pk_weibull PRIMARY KEY (id)
 );
 
 /*

http://git-wip-us.apache.org/repos/asf/madlib/blob/d7d54b97/src/ports/postgres/modules/regress/test/linear.sql_in
----------------------------------------------------------------------
diff --git a/src/ports/postgres/modules/regress/test/linear.sql_in 
b/src/ports/postgres/modules/regress/test/linear.sql_in
index 20ab7e9..9013108 100644
--- a/src/ports/postgres/modules/regress/test/linear.sql_in
+++ b/src/ports/postgres/modules/regress/test/linear.sql_in
@@ -15,7 +15,6 @@ CREATE TABLE weibull (
     x1 DOUBLE PRECISION,
     x2 DOUBLE PRECISION,
     y DOUBLE PRECISION
-    , CONSTRAINT pk_weibull PRIMARY KEY (id)
 ) m4_ifdef(`__POSTGRESQL__', `', `DISTRIBUTED BY (id)');
 
 /*
@@ -68,7 +67,6 @@ CREATE TABLE unm (
     x1 DOUBLE PRECISION,
     x2 DOUBLE PRECISION,
     y DOUBLE PRECISION
-    , CONSTRAINT pk_unm PRIMARY KEY (id)
 );
 
 INSERT INTO unm(id, x1, x2, y) VALUES
@@ -106,7 +104,6 @@ CREATE TABLE houses (
     price INTEGER,
     size INTEGER,
     lot INTEGER
-    , CONSTRAINT pk_houses PRIMARY KEY (id)
 );
 
 INSERT INTO houses(tax, bedroom, bath, price, size, lot) VALUES

http://git-wip-us.apache.org/repos/asf/madlib/blob/d7d54b97/src/ports/postgres/modules/regress/test/logistic.ic.sql_in
----------------------------------------------------------------------
diff --git a/src/ports/postgres/modules/regress/test/logistic.ic.sql_in 
b/src/ports/postgres/modules/regress/test/logistic.ic.sql_in
index bd7ed3a..1373be1 100644
--- a/src/ports/postgres/modules/regress/test/logistic.ic.sql_in
+++ b/src/ports/postgres/modules/regress/test/logistic.ic.sql_in
@@ -35,7 +35,6 @@ CREATE TABLE patients (
     second_attack INTEGER,
     treatment INTEGER,
     trait_anxiety INTEGER
-    , CONSTRAINT pk_patient PRIMARY key (id)
 );
 
 INSERT INTO patients(ID, second_attack, treatment, trait_anxiety) VALUES

http://git-wip-us.apache.org/repos/asf/madlib/blob/d7d54b97/src/ports/postgres/modules/regress/test/logistic.sql_in
----------------------------------------------------------------------
diff --git a/src/ports/postgres/modules/regress/test/logistic.sql_in 
b/src/ports/postgres/modules/regress/test/logistic.sql_in
index 697dce4..fa6fc7d 100644
--- a/src/ports/postgres/modules/regress/test/logistic.sql_in
+++ b/src/ports/postgres/modules/regress/test/logistic.sql_in
@@ -15,7 +15,6 @@ CREATE TABLE patients (
     second_attack INTEGER,
     treatment INTEGER,
     trait_anxiety INTEGER
-    , CONSTRAINT pk_patient PRIMARY key (id)
 )m4_ifdef(`__POSTGRESQL__', `', `DISTRIBUTED BY (id)');
 
 INSERT INTO patients(ID, second_attack, treatment, trait_anxiety) VALUES
@@ -177,7 +176,6 @@ CREATE TABLE crime (
     Unemp2  INTEGER,
     Median  INTEGER,
     BelowMed INTEGER
-    , CONSTRAINT pk_crime PRIMARY key (id)
 )m4_ifdef(`__POSTGRESQL__', `', `DISTRIBUTED BY (id)');
 
 INSERT INTO crime(
@@ -271,7 +269,6 @@ CREATE TABLE grad_school (
     gre INTEGER,
     gpa DOUBLE PRECISION,
     rank INTEGER
-    , CONSTRAINT pk_grad_school PRIMARY key (id)
 )m4_ifdef(`__POSTGRESQL__', `', `DISTRIBUTED BY (id)');
 
 COPY grad_school (admit, gre, gpa, rank) FROM STDIN;

http://git-wip-us.apache.org/repos/asf/madlib/blob/d7d54b97/src/ports/postgres/modules/regress/test/marginal.ic.sql_in
----------------------------------------------------------------------
diff --git a/src/ports/postgres/modules/regress/test/marginal.ic.sql_in 
b/src/ports/postgres/modules/regress/test/marginal.ic.sql_in
index 0279650..9922342 100644
--- a/src/ports/postgres/modules/regress/test/marginal.ic.sql_in
+++ b/src/ports/postgres/modules/regress/test/marginal.ic.sql_in
@@ -29,7 +29,6 @@ CREATE TABLE patients (
     second_attack INTEGER,
     treatment INTEGER,
     trait_anxiety INTEGER
-    , CONSTRAINT pk_patient PRIMARY key (id)
 );
 INSERT INTO patients(ID, second_attack, treatment, trait_anxiety) VALUES
 ( 1, 1, 1, 70),

http://git-wip-us.apache.org/repos/asf/madlib/blob/d7d54b97/src/ports/postgres/modules/regress/test/marginal.sql_in
----------------------------------------------------------------------
diff --git a/src/ports/postgres/modules/regress/test/marginal.sql_in 
b/src/ports/postgres/modules/regress/test/marginal.sql_in
index cc67b50..4d037da 100644
--- a/src/ports/postgres/modules/regress/test/marginal.sql_in
+++ b/src/ports/postgres/modules/regress/test/marginal.sql_in
@@ -10,7 +10,6 @@ CREATE TABLE patients (
     second_attack INTEGER,
     treatment INTEGER,
     trait_anxiety INTEGER
-    , CONSTRAINT pk_patient PRIMARY key (id)
 )m4_ifdef(`__POSTGRESQL__', `', `DISTRIBUTED BY (id)');
 INSERT INTO patients(ID, second_attack, treatment, trait_anxiety) VALUES
 ( 1, 1, 1, 70),

http://git-wip-us.apache.org/repos/asf/madlib/blob/d7d54b97/src/ports/postgres/modules/regress/test/multilogistic.ic.sql_in
----------------------------------------------------------------------
diff --git a/src/ports/postgres/modules/regress/test/multilogistic.ic.sql_in 
b/src/ports/postgres/modules/regress/test/multilogistic.ic.sql_in
index 0c5a759..dd2925a 100644
--- a/src/ports/postgres/modules/regress/test/multilogistic.ic.sql_in
+++ b/src/ports/postgres/modules/regress/test/multilogistic.ic.sql_in
@@ -35,7 +35,6 @@ CREATE TABLE patients (
     "SECOND_ATTACK" INTEGER,
     treatment INTEGER,
     trait_anxiety INTEGER
-    ,CONSTRAINT pk_patient PRIMARY key (id)
 );
 
 INSERT INTO patients(id, "SECOND_ATTACK", treatment, trait_anxiety) VALUES

http://git-wip-us.apache.org/repos/asf/madlib/blob/d7d54b97/src/ports/postgres/modules/regress/test/multilogistic.sql_in
----------------------------------------------------------------------
diff --git a/src/ports/postgres/modules/regress/test/multilogistic.sql_in 
b/src/ports/postgres/modules/regress/test/multilogistic.sql_in
index a97d6b4..21bce42 100644
--- a/src/ports/postgres/modules/regress/test/multilogistic.sql_in
+++ b/src/ports/postgres/modules/regress/test/multilogistic.sql_in
@@ -16,7 +16,6 @@ CREATE TABLE patients (
     "SECOND_ATTACK" INTEGER,
     treatment INTEGER,
     trait_anxiety INTEGER
-    ,CONSTRAINT pk_patient PRIMARY key (id)
 ) m4_ifdef(`__POSTGRESQL__', `', `DISTRIBUTED BY (id)');
 
 INSERT INTO patients(id, "SECOND_ATTACK", treatment, trait_anxiety) VALUES
@@ -380,7 +379,6 @@ CREATE TABLE patients_with_null (
     second_attack INTEGER,
     treatment INTEGER,
     trait_anxiety INTEGER
-    ,CONSTRAINT pk_patient_null PRIMARY key (id)
 ) m4_ifdef(`__POSTGRESQL__', `', `DISTRIBUTED BY (id)');
 INSERT INTO patients_with_null(ID, second_attack, treatment, trait_anxiety) 
VALUES
 ( 1, 1, 1, 70),
@@ -439,7 +437,6 @@ CREATE TABLE patients_all_null (
     second_attack INTEGER,
     treatment INTEGER,
     trait_anxiety INTEGER
-    ,CONSTRAINT pk_patient_all_null PRIMARY key (id)
 )m4_ifdef(`__POSTGRESQL__', `', `DISTRIBUTED BY (id)');
 INSERT INTO patients_all_null(ID, second_attack, treatment, trait_anxiety) 
VALUES
 ( 1, NULL, 1, 70),

http://git-wip-us.apache.org/repos/asf/madlib/blob/d7d54b97/src/ports/postgres/modules/regress/test/robust.ic.sql_in
----------------------------------------------------------------------
diff --git a/src/ports/postgres/modules/regress/test/robust.ic.sql_in 
b/src/ports/postgres/modules/regress/test/robust.ic.sql_in
index 54a26ff..129fae8 100644
--- a/src/ports/postgres/modules/regress/test/robust.ic.sql_in
+++ b/src/ports/postgres/modules/regress/test/robust.ic.sql_in
@@ -34,7 +34,6 @@ CREATE TABLE weibull (
     x1 DOUBLE PRECISION,
     x2 DOUBLE PRECISION,
     y DOUBLE PRECISION
-    , CONSTRAINT pk_weibull PRIMARY KEY (id)
 );
 
 /*

http://git-wip-us.apache.org/repos/asf/madlib/blob/d7d54b97/src/ports/postgres/modules/regress/test/robust.sql_in
----------------------------------------------------------------------
diff --git a/src/ports/postgres/modules/regress/test/robust.sql_in 
b/src/ports/postgres/modules/regress/test/robust.sql_in
index c210fd6..8f23e22 100644
--- a/src/ports/postgres/modules/regress/test/robust.sql_in
+++ b/src/ports/postgres/modules/regress/test/robust.sql_in
@@ -15,7 +15,6 @@ CREATE TABLE weibull (
     x1 DOUBLE PRECISION,
     x2 DOUBLE PRECISION,
     y DOUBLE PRECISION
-    , CONSTRAINT pk_weibull PRIMARY KEY (id)
 ) m4_ifdef(`__POSTGRESQL__', `', `DISTRIBUTED BY (id)');
 
 /*
@@ -102,7 +101,6 @@ CREATE TABLE patients (
     second_attack INTEGER,
     treatment INTEGER,
     trait_anxiety INTEGER
-    , CONSTRAINT pk_patient PRIMARY key (id)
 ) m4_ifdef(`__POSTGRESQL__', `', `DISTRIBUTED BY (id)');
 INSERT INTO patients(ID, second_attack, treatment, trait_anxiety) VALUES
 ( 1, 1, 1, 70),

http://git-wip-us.apache.org/repos/asf/madlib/blob/d7d54b97/src/ports/postgres/modules/stats/test/cox_prop_hazards.ic.sql_in
----------------------------------------------------------------------
diff --git a/src/ports/postgres/modules/stats/test/cox_prop_hazards.ic.sql_in 
b/src/ports/postgres/modules/stats/test/cox_prop_hazards.ic.sql_in
index 30854ee..596a320 100644
--- a/src/ports/postgres/modules/stats/test/cox_prop_hazards.ic.sql_in
+++ b/src/ports/postgres/modules/stats/test/cox_prop_hazards.ic.sql_in
@@ -33,7 +33,6 @@ CREATE TABLE leukemia (
     wbc DOUBLE PRECISION,
     timedeath INTEGER,
     status BOOLEAN
-    ,CONSTRAINT pk_leukemia PRIMARY key (id)
 );
 
 

http://git-wip-us.apache.org/repos/asf/madlib/blob/d7d54b97/src/ports/postgres/modules/stats/test/cox_prop_hazards.sql_in
----------------------------------------------------------------------
diff --git a/src/ports/postgres/modules/stats/test/cox_prop_hazards.sql_in 
b/src/ports/postgres/modules/stats/test/cox_prop_hazards.sql_in
index 7571e7f..8b294aa 100644
--- a/src/ports/postgres/modules/stats/test/cox_prop_hazards.sql_in
+++ b/src/ports/postgres/modules/stats/test/cox_prop_hazards.sql_in
@@ -16,7 +16,6 @@ CREATE TABLE leukemia (
     wbc DOUBLE PRECISION,
     timedeath INTEGER,
     status BOOLEAN
-    ,CONSTRAINT pk_leukemia PRIMARY key (id)
 )m4_ifdef(<!__POSTGRESQL__!>, <!!>, <!DISTRIBUTED BY (id)!>);
 
 
@@ -101,7 +100,6 @@ CREATE TABLE leukemia (
     wbc DOUBLE PRECISION,
     timedeath INTEGER,
     status BOOLEAN
-    ,CONSTRAINT pk_leukemia PRIMARY key (id)
 )m4_ifdef(<!__POSTGRESQL__!>, <!!>, <!DISTRIBUTED BY (id)!>);
 
 INSERT INTO leukemia(id, grp, wbc, timedeath, status) VALUES

Reply via email to