You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by sa...@apache.org on 2017/05/12 20:25:55 UTC
[20/22] incubator-trafodion git commit: Merge branch 'master' of
github.com:apache/incubator-trafodion into sean_traf
Merge branch 'master' of github.com:apache/incubator-trafodion into sean_traf
Conflicts:
core/sql/regress/seabase/EXPECTED022
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/7224c058
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/7224c058
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/7224c058
Branch: refs/heads/master
Commit: 7224c058f6ea313585982212061ba9a6ced00577
Parents: 85115b0 c25694d
Author: Sean Broeder <sb...@edev05.esgyn.local>
Authored: Fri May 12 13:30:50 2017 +0000
Committer: Sean Broeder <sb...@edev05.esgyn.local>
Committed: Fri May 12 13:30:50 2017 +0000
----------------------------------------------------------------------
NOTICE | 2 +-
core/conn/jdbcT4/pom.xml | 93 +++++++++++++
.../odbc/odbcclient/unixcli/cli/sqltocconv.cpp | 4 +
core/sqf/build-scripts/build.branch | 4 +-
core/sqf/sqenvcom.sh | 32 ++---
core/sqf/src/seabed/src/ms.cpp | 2 +
core/sql/cli/CliExtern.cpp | 23 +++-
core/sql/regress/seabase/EXPECTED022 | 129 +++----------------
core/sql/regress/seabase/TEST022 | 33 ++---
.../src/asciidoc/_chapters/ambari_install.adoc | 51 ++++++--
docs/provisioning_guide/src/images/amb1.PNG | Bin 0 -> 46318 bytes
docs/provisioning_guide/src/images/amb2.PNG | Bin 0 -> 12063 bytes
docs/provisioning_guide/src/images/amb3.PNG | Bin 0 -> 13764 bytes
docs/provisioning_guide/src/images/amb4.PNG | Bin 0 -> 44413 bytes
docs/provisioning_guide/src/images/amb5.PNG | Bin 0 -> 10552 bytes
.../src/asciidoc/_chapters/olap_functions.adoc | 2 +-
.../sql_functions_and_expressions.adoc | 4 +-
install/ambari-installer/Makefile | 11 +-
.../2.1/configuration/traf-cluster-env.xml | 1 +
.../2.1/configuration/trafodion-env.xml | 4 +
.../TRAFODION/2.1/package/scripts/params.py | 2 +
.../2.1/package/scripts/trafodionmaster.py | 3 +-
install/python-installer/db_install.py | 11 +-
install/python-installer/scripts/traf_check.py | 5 +
win-odbc64/odbcclient/drvr35/sqltocconv.cpp | 6 +
25 files changed, 245 insertions(+), 177 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7224c058/core/sql/regress/seabase/EXPECTED022
----------------------------------------------------------------------
diff --cc core/sql/regress/seabase/EXPECTED022
index 399deac,80784c7..64a6e30
--- a/core/sql/regress/seabase/EXPECTED022
+++ b/core/sql/regress/seabase/EXPECTED022
@@@ -635,13 -635,13 +635,13 @@@ ROW_ID (EXPR
--- SQL operation complete.
>>invoke t022hbm1;
- -- Definition of table #CAT.#SCH.T022HBM1
- -- Definition current
+ -- Definition of Trafodion table TRAFODION.SCH.T022HBM1
+ -- Definition current Thu May 11 22:43:35 2017
- (
- SYSKEY LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
- , A INT DEFAULT NULL
- )
+ (
+ SYSKEY LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
+ , A INT DEFAULT NULL
+ )
--- SQL operation complete.
>>drop table t022hbm1;
@@@ -720,17 -720,17 +720,17 @@@ a2
--- SQL operation complete.
>>invoke t022hbm1_like;
- -- Definition of table #CAT.#SCH.T022HBM1_LIKE
- -- Definition current
+ -- Definition of Trafodion table TRAFODION.SCH.T022HBM1_LIKE
+ -- Definition current Thu May 11 22:43:57 2017
- (
- "cf".A VARCHAR(4) CHARACTER SET ISO88591 COLLATE
- DEFAULT NO DEFAULT NOT NULL NOT DROPPABLE
- , "cf".B CHAR(4) CHARACTER SET ISO88591 COLLATE
- DEFAULT DEFAULT NULL
- , "cf".C INT DEFAULT NULL
- )
- PRIMARY KEY (A ASC)
+ (
+ "cf".A VARCHAR(4) CHARACTER SET ISO88591 COLLATE
+ DEFAULT NO @eof@ NULL NOT DROPPABLE
+ , "cf".B CHAR(4) CHARACTER SET ISO88591 COLLATE
+ DEFAULT DEFAULT NULL
+ , "cf".C INT DEFAULT NULL
+ )
+ PRIMARY KEY (A ASC)
--- SQL operation complete.
>>
@@@ -840,93 -840,30 +840,30 @@@ a2 ?
>>drop external table t022hbm1;
--- SQL operation complete.
->>create external table t022hbm1 (a varchar(4) not null, b int)
-+> primary key (a)
-+> attribute default column family 'cf'
-+> map to hbase table t022hbm1
-+> data format native;
+>>create external table t022hbm1 (a varchar(4) not null, b int)
++> primary key (a)
++> attribute default column family 'cf'
++> map to hbase table t022hbm1
++> data format native;
--- SQL operation complete.
- >>
- >>insert into t022hbm1 values ('a', 1);
-
- --- 1 row(s) inserted.
- >>select * from t022hbm1;
-
- A B
- ---- -----------
-
- a 1
-
- --- 1 row(s) selected.
- >>update t022hbm1 set b = b + 1;
-
- --- 1 row(s) updated.
- >>select * from t022hbm1;
-
- A B
- ---- -----------
-
- a 2
-
- --- 1 row(s) selected.
- >>insert into t022hbm1 values ('a', 1);
-
- *** ERROR[8102] The operation is prevented by a unique constraint.
-
- --- 0 row(s) inserted.
- >> -- should fail
- >>insert into t022hbm1 values ('b', null);
-
- --- 1 row(s) inserted.
- >>select * from t022hbm1;
-
- A B
- ---- -----------
-
- a 2
- b ?
-
- --- 2 row(s) selected.
- >>delete from t022hbm1 where a = 'a';
-
- --- 1 row(s) deleted.
- >>select * from t022hbm1;
-
- A B
- ---- -----------
-
- b ?
-
- --- 1 row(s) selected.
- >>update t022hbm1 set b = 10;
-
- --- 1 row(s) updated.
- >>select * from t022hbm1;
-
- A B
- ---- -----------
-
- b 10
-
- --- 1 row(s) selected.
- >>update t022hbm1 set b = null;
-
- --- 1 row(s) updated.
- >>select * from t022hbm1;
-
- A B
- ---- -----------
-
- b ?
-
- --- 1 row(s) selected.
- >>delete from t022hbm1;
-
- --- 1 row(s) deleted.
- >>select * from t022hbm1;
-
- --- 0 row(s) selected.
+ >>--This part of the test is being commented out due to non deterministic results
+ >>--It needs to be renabled after this JIRA is fixed : TRAFODION-2613
+ >>--insert into t022hbm1 values ('a', 1);
+ >>--select * from t022hbm1;
+ >>--update t022hbm1 set b = b + 1;
+ >>--select * from t022hbm1;
+ >>--insert into t022hbm1 values ('a', 1); -- should fail
+ >>--insert into t022hbm1 values ('b', null);
+ >>--select * from t022hbm1;
+ >>--delete from t022hbm1 where a = 'a';
+ >>--select * from t022hbm1;
+ >>--update t022hbm1 set b = 10;
+ >>--select * from t022hbm1;
+ >>--update t022hbm1 set b = null;
+ >>--select * from t022hbm1;
+ >>--delete from t022hbm1;
+ >>--select * from t022hbm1;
>>
>>drop external table t022hbm1;
@@@ -1090,39 -1027,15 +1027,15 @@@ A B
--- SQL operation complete.
>>invoke t022hbm1;
--- Definition of Trafodion HBase mapped table T022HBM1
--- Definition current Thu May 11 22:45:13 2017
+-- Definition of TRAFODION HBase mapped table T022HBM1
- -- Definition current
-
- (
- "cf".A VARCHAR(4) CHARACTER SET ISO88591 COLLATE
- DEFAULT NO @eof@ NULL NOT DROPPABLE
- , "cf".B INT DEFAULT NULL
- )
- PRIMARY KEY NOT SERIALIZED (A ASC)
-
- --- SQL operation complete.
- >>
- >>drop external table t022hbm1;
-
- --- SQL operation complete.
- >>create external table t022hbm1 (a char(4) not null, b int)
- +> primary key serialized (a)
- +> attribute default column family 'cf'
- +> map to hbase table t022hbm1
- +> data format native;
-
- --- SQL operation complete.
- >>invoke t022hbm1;
-
- -- Definition of TRAFODION HBase mapped table T022HBM1
+-- Definition current
- (
- "cf".A VARCHAR(4) CHARACTER SET ISO88591 COLLATE
- DEFAULT NO DEFAULT NOT NULL NOT DROPPABLE
- , "cf".B INT DEFAULT NULL
- )
- PRIMARY KEY NOT SERIALIZED (A ASC)
+ (
+ "cf".A CHAR(4) CHARACTER SET ISO88591 COLLATE
+ DEFAULT NO @eof@ NULL NOT DROPPABLE
+ , "cf".B INT DEFAULT NULL
+ )
+ PRIMARY KEY (A ASC)
--- SQL operation complete.
>>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7224c058/core/sql/regress/seabase/TEST022
----------------------------------------------------------------------