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/08 20:28:36 UTC
[4/8] incubator-trafodion git commit: Merge remote branch
'origin/master' into hdfs_chdir_work
Merge remote branch 'origin/master' into hdfs_chdir_work
Conflicts:
core/sql/regress/executor/TEST130
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/4b27589a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/4b27589a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/4b27589a
Branch: refs/heads/master
Commit: 4b27589acaf0ab0861f3a892735ea2ce9b165d27
Parents: f094aa0 d0c4d73
Author: Sandhya Sundaresan <sa...@edev08.esgyn.local>
Authored: Tue May 2 17:29:42 2017 +0000
Committer: Sandhya Sundaresan <sa...@edev08.esgyn.local>
Committed: Tue May 2 17:29:42 2017 +0000
----------------------------------------------------------------------
core/sql/arkcmp/CmpStatement.cpp | 23 +-
core/sql/bin/clitest.cpp | 2 +-
core/sql/cli/Statement.cpp | 3 +
core/sql/cli/sqlcli.h | 5 +-
core/sql/clitest/blobtest.cpp | 4 +-
core/sql/comexe/CmpMessage.h | 10 +-
core/sql/common/ComSmallDefs.h | 1 +
core/sql/executor/ExExeUtilCli.cpp | 25 +-
core/sql/executor/ExExeUtilCli.h | 3 +-
core/sql/executor/ExExeUtilExplain.cpp | 20 +-
core/sql/executor/ExExeUtilLoad.cpp | 2 +-
core/sql/exp/ExpLOB.cpp | 103 +++---
core/sql/exp/ExpLOB.h | 21 +-
core/sql/exp/ExpLOBaccess.cpp | 213 +++++++++++--
core/sql/exp/ExpLOBaccess.h | 22 +-
core/sql/exp/ExpLOBenums.h | 17 +-
core/sql/exp/ExpLOBinterface.cpp | 75 +++--
core/sql/exp/ExpLOBinterface.h | 34 +-
core/sql/generator/GenItemFunc.cpp | 7 +-
core/sql/generator/GenPreCode.cpp | 52 ++-
core/sql/optimizer/ItemFunc.h | 2 +-
core/sql/parser/SqlParserGlobalsCmn.h | 84 +----
core/sql/parser/SqlParserGlobalsEnum.h | 119 +++++++
core/sql/regress/executor/EXPECTED130 | 469 +++++++++++-----------------
core/sql/regress/executor/TEST130 | 39 ++-
core/sql/regress/privs1/EXPECTED120 | 16 +
core/sql/regress/privs1/TEST120 | 3 +
core/sql/sqlcomp/CmpMain.cpp | 10 +-
core/sql/sqlcomp/CmpMain.h | 3 +-
core/sql/sqlcomp/nadefaults.cpp | 2 +-
licenses/lic-pyinstall-src | 4 +-
31 files changed, 825 insertions(+), 568 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4b27589a/core/sql/regress/executor/TEST130
----------------------------------------------------------------------
diff --cc core/sql/regress/executor/TEST130
index bdcd6a1,b98f428..6f174a3
--- a/core/sql/regress/executor/TEST130
+++ b/core/sql/regress/executor/TEST130
@@@ -524,22 -548,24 +548,26 @@@ select * from table(lob stats(tlob130gt
?section lob_external
--test external lobs
create table tlob130ext (c1 int not null, c2 blob, c3 clob, c4 blob storage 'external', primary key (c1));
++
+ create table tlob130ext2 (c1 int not null, c2 blob, c3 clob, c4 blob storage 'external', primary key (c1));
+ create table tlob130_not_external (c1 int not null , c2 blob, c3 blob, c4 blob, primary key (c1));
-insert into tlob130ext values(1, stringtolob('first lob'), filetolob('hdfs:///lobs/lob_input_a1.txt'),externaltolob('hdfs:///lobs/lob_input_a1.txt'));
-insert into tlob130ext values(2, stringtolob('second lob'), filetolob('hdfs:///lobs/lob_input_b1.txt'),externaltolob('hdfs:///lobs/lob_input_b1.txt'));
-insert into tlob130ext values(3, stringtolob('third lob'), filetolob('hdfs:///lobs/lob_input_c1.txt'),externaltolob('hdfs:///lobs/lob_input_c1.txt'));
+insert into tlob130ext values(1, stringtolob('first lob'), filetolob('hdfs:///user/trafodion/lobs/lob_input_a1.txt'),externaltolob('hdfs:///user/trafodion/lobs/lob_input_a1.txt'));
+insert into tlob130ext values(2, stringtolob('second lob'), filetolob('hdfs:///user/trafodion/lobs/lob_input_b1.txt'),externaltolob('hdfs:///user/trafodion/lobs/lob_input_b1.txt'));
+insert into tlob130ext values(3, stringtolob('third lob'), filetolob('hdfs:///user/trafodion/lobs/lob_input_c1.txt'),externaltolob('hdfs:///user/trafodion/lobs/lob_input_c1.txt'));
++
--negative cases
-insert into tlob130ext values(2, externaltolob('first lob'), filetolob('hdfs:///lobs/lob_input_a1.txt'),externaltolob('hdfs:///lobs/lob_input_a1.txt'));
-insert into tlob130ext values(3, stringtolob('first lob'), filetolob('hdfs:///lobs/lob_input_a1.txt'),filetolob('hdfs:///lobs/lob_input_a1.txt'));
-update tlob130ext set c4=stringtolob('hdfs:///lobs/lob_input_a1.txt', append) where c1=1;
-update tlob130ext set c4=externaltolob('hdfs:///lobs/lob_input_a1.txt', append) where c1=1;
-update tlob130ext set c3=externaltolob('hdfs:///lobs/lob_input_b1.txt') where c1=1;
+insert into tlob130ext values(2, externaltolob('first lob'), filetolob('hdfs:///user/trafodion/lobs/lob_input_a1.txt'),externaltolob('hdfs:///user/trafodion/lobs/lob_input_a1.txt'));
+insert into tlob130ext values(3, stringtolob('first lob'), filetolob('hdfs:///user/trafodion/lobs/lob_input_a1.txt'),filetolob('hdfs:///user/trafodion/lobs/lob_input_a1.txt'));
+update tlob130ext set c4=stringtolob('hdfs:///user/trafodion/lobs/lob_input_a1.txt', append) where c1=1;
+update tlob130ext set c4=externaltolob('hdfs:///user/trafodion/lobs/lob_input_a1.txt', append) where c1=1;
+update tlob130ext set c3=externaltolob('hdfs:///user/trafodion/lobs/lob_input_b1.txt') where c1=1;
update tlob130ext set c4=stringtolob('cannot allow this') where c1=1;
delete from tlob130ext where c1=1;
-insert into tlob130ext values(1, stringtolob('first lob'),externaltolob('hdfs:///lobs/lob_input_a1.txt'),externaltolob('hdfs:///lobs/lob_input_a1.txt'));
-insert into tlob130ext values(1, stringtolob('first lob'), filetolob('hdfs:///lobs/lob_input_a1.txt'),externaltolob('hdfs:///lobs/lob_input_a1.txt'));
+insert into tlob130ext values(1, stringtolob('first lob'),externaltolob('hdfs:///user/trafodion/lobs/lob_input_a1.txt'),externaltolob('hdfs:///user/trafodion/lobs/lob_input_a1.txt'));
+insert into tlob130ext values(1, stringtolob('first lob'), filetolob('hdfs:///user/trafodion/lobs/lob_input_a1.txt'),externaltolob('hdfs:///user/trafodion/lobs/lob_input_a1.txt'));
-- the next one should see error 8557
-insert into tlob130ext values(1, stringtolob('first lob'), filetolob('hdfs:///lobs/lob_input_a1.txt'),
-externaltolob('hdfs:///lobs/reallyLongDirectoryName0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789/lob_input_a1012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789.txt'));
+insert into tlob130ext values(1, stringtolob('first lob'), filetolob('hdfs:///user/trafodion/lobs/lob_input_a1.txt'),
+externaltolob('hdfs:///user/trafodion/lobs/reallyLongDirectoryName0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789/lob_input_a1012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789.txt'));
select lobtostring(c2,50),lobtostring(c3,50),lobtostring(c4,50) from tlob130ext;
update tlob130ext set c3=stringtolob('can allow this') where c1=1;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4b27589a/core/sql/sqlcomp/nadefaults.cpp
----------------------------------------------------------------------
diff --cc core/sql/sqlcomp/nadefaults.cpp
index 38b1feb,19fe1ac..0ab0f28
--- a/core/sql/sqlcomp/nadefaults.cpp
+++ b/core/sql/sqlcomp/nadefaults.cpp
@@@ -2090,10 -2090,10 +2090,10 @@@ SDDkwd__(ISO_MAPPING, (char *
// (unused)default size is 32000. Change this to extract more data into memory.
DDui___(LOB_OUTPUT_SIZE, "32000"),
- DD_____(LOB_STORAGE_FILE_DIR, "/lobs"),
+ DD_____(LOB_STORAGE_FILE_DIR, "/user/trafodion/lobs"),
// storage types defined in exp/ExpLOBenum.h.
- // Default is hdfs_file (value = 1)
+ // Default is hdfs_file (value = 2)
DDint__(LOB_STORAGE_TYPE, "2"),
//New default size for buffer size for local node