date:20160531

[5/8] incubator-trafodion git commit: Merge remote branch 'origin/master'

2016-05-31 Thread sandhya

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/db3ebf5d/core/sql/regress/executor/EXPECTED130
--
diff --cc core/sql/regress/executor/EXPECTED130
index a119aed,559ab3d..875a0ed
--- a/core/sql/regress/executor/EXPECTED130
+++ b/core/sql/regress/executor/EXPECTED130
@@@ -53,9 -53,9 +53,9 @@@ C
  C1   C2
  ---  
---
 -
  
-   1  
LOBH000200010321792085830706042419321792085835428245518212331057036978909020"TRAFODION"."LOB130"











   
  
-   2  
LOBH000200010321792085830706042419321792085835962263118212331057042314939020"TRAFODION"."LOB130"











   
  
-   3  
LOBH000200010321792085830706042419321792085836459216918212331057047401716020"TRAFODION"."LOB130"











   
  
 -  1  
LOBH020001004189324641697287771841893246425245100618212329831345920804020"TRAFODION"."LOB130"

[3/8] incubator-trafodion git commit: Support for external lobs. Data files are stored externally in HDFS and only filehandles and file locations are stored in internal Trafodion tables.

2016-05-31 Thread sandhya

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/5a3f2024/core/sql/regress/executor/EXPECTED130
--
diff --git a/core/sql/regress/executor/EXPECTED130 
b/core/sql/regress/executor/EXPECTED130
index bf7d45f..a119aed 100644
--- a/core/sql/regress/executor/EXPECTED130
+++ b/core/sql/regress/executor/EXPECTED130
@@ -53,9 +53,9 @@ C1
 C1   C2
 ---  

 
 
-  1  
LOBH0200010669695009493408479919669695009498814985418212329581527003582020"TRAFODION"."LOB130"











  
 
-  2  
LOBH0200010669695009493408479919669695009499452607918212329581533443121020"TRAFODION"."LOB130"











  
 
-  3  
LOBH0200010669695009493408479919669695009500088291418212329581539790325020"TRAFODION"."LOB130"











  
 
+  1  
LOBH000200010321792085830706042419321792085835428245518212331057036978909020"TRAFODION"."LOB130"

[4/8] incubator-trafodion git commit: Support for external lobs. Data files are stored externally in HDFS and only filehandles and file locations are stored in internal Trafodion tables.

2016-05-31 Thread sandhya

Support for external lobs. Data files are stored externally in HDFS and only 
filehandles and file locations are stored in internal Trafodion tables.


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

Branch: refs/heads/master
Commit: 5a3f20249cabb16b3afe64ab0d21cdf2decafeea
Parents: 17c0530
Author: Sandhya Sundaresan 
Authored: Fri May 27 04:41:13 2016 +
Committer: Sandhya Sundaresan 
Committed: Fri May 27 04:41:13 2016 +

--
 core/sql/bin/SqlciErrors.txt   |   1 +
 core/sql/cli/Cli.cpp   |  49 +++-
 core/sql/comexe/ComTdbExeUtil.cpp  |  25 ++
 core/sql/comexe/ComTdbExeUtil.h|  34 +--
 core/sql/common/CharType.cpp   |   4 +
 core/sql/common/CharType.h |   1 +
 core/sql/executor/ExExeUtil.h  |   6 +-
 core/sql/executor/ExExeUtilCli.cpp |   5 +-
 core/sql/executor/ExExeUtilGet.cpp | 153 -
 core/sql/executor/ExHdfsScan.cpp   |   1 +
 core/sql/exp/ExpLOB.cpp|  35 +--
 core/sql/exp/ExpLOB.h  |  14 +-
 core/sql/exp/ExpLOBaccess.cpp  | 133 ---
 core/sql/exp/ExpLOBenums.h |   3 +-
 core/sql/exp/ExpLOBinterface.cpp   |   8 +-
 core/sql/generator/GenPreCode.cpp  |  35 ++-
 core/sql/generator/GenRelExeUtil.cpp   |  15 +-
 core/sql/optimizer/BindRelExpr.cpp |   2 +-
 core/sql/optimizer/ItemFunc.h  |   5 +
 core/sql/optimizer/NAColumn.h  |   2 +-
 core/sql/parser/ElemDDLCol.cpp |   2 +-
 core/sql/parser/sqlparser.y|  33 ++-
 core/sql/regress/executor/EXPECTED130  | 293 +---
 core/sql/regress/executor/TEST130  |  50 +++-
 core/sql/regress/executor/TEST130_argfile2 |   2 +-
 core/sql/sqlcomp/CmpSeabaseDDLtable.cpp|   9 +-
 26 files changed, 717 insertions(+), 203 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/5a3f2024/core/sql/bin/SqlciErrors.txt
--
diff --git a/core/sql/bin/SqlciErrors.txt b/core/sql/bin/SqlciErrors.txt
index 198a5d9..6fbdae8 100644
--- a/core/sql/bin/SqlciErrors.txt
+++ b/core/sql/bin/SqlciErrors.txt
@@ -409,6 +409,7 @@
 1429 Z 9 BEGINNER MINOR DBADMIN Inserts into _ROW_ format external 
hbase tables can only use the VALUES clause and must use the column_create 
function to create values.
 1430 3F000 9 BEGINNER MAJOR DBADMIN A schema name that starts and ends 
with an "_"(underscore) is reserved for internal usage. It cannot be used to 
create a user schema.
 1431 Z 9 BEGINNER MINOR DBADMIN Object $0~String0 exists in HBase. 
This could be due to a concurrent transactional ddl operation in progress on 
this table.
+1432 Z 9 BEGINNER MINOR DBADMIN Input LOB type $0~Int0 does not match 
column's storage type : $1~Int1 Column name : $0~String0 .
 1500 Z 9 ADVANCED CRTCL DIALOUT The CATSYS - CAT_REFERENCES system 
schema relationship for catalog $0~CatalogName might be corrupt.
 1501 Z 9  U UUU --- unused as of 5/7/12 ---
 1502 Z 9 ADVANCED CRTCL DIALOUT The OBJECTS - REPLICAS definition 
schema relationship for $0~String0 $1~TableName might be corrupt.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/5a3f2024/core/sql/cli/Cli.cpp
--
diff --git a/core/sql/cli/Cli.cpp b/core/sql/cli/Cli.cpp
index 09f03c5..ecfe072 100644
--- a/core/sql/cli/Cli.cpp
+++ b/core/sql/cli/Cli.cpp
@@ -9677,6 +9677,7 @@ Lng32 SQLCLI_LOBcliInterface
// insert into lob descriptor chunks table
if (blackBox && (blackBoxLen && (*blackBoxLen > 0)))
  {
+//blackBox points to external file name
str_sprintf(query, "insert into table(ghost table %s) values (%Ld, 
%Ld, 1, %Ld, %Ld, '%s')",
lobDescChunksName, descPartnKey, descSyskey,
(dataLen ? *dataLen : 0),
@@ -9731,6 +9732,13 @@ Lng32 SQLCLI_LOBcliInterface
 
 case LOB_CLI_INSERT_APPEND:
   {
+if (lobType == Lob_External_HDFS_File)
+  {
+// Not allowed. For external Lobs there shoudl be only one
+// chunk associated with the contents of the external file.
+cliRC = -LOB_DESC_APPEND_ERROR;   
+goto error_return;
+  } 
str_sprintf(query, "update table(ghost table %s) set numChunks = 
numChunks + 1,

[2/8] incubator-trafodion git commit: Support for external lobs. Data files are stored externally in HDFS and only filehandles and file locations are stored in internal Trafodion tables.

2016-05-31 Thread sandhya

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/5a3f2024/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
--
diff --git a/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp 
b/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
index 3bea993..7db6d28 100644
--- a/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
+++ b/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
@@ -2212,12 +2212,11 @@ short CmpSeabaseDDL::createSeabaseTable2(
 {
   
   lobNumList[j] = i; //column->getColumnNumber();
-  lobTypList[j] = 
-(short)(column->getLobStorage() == Lob_Invalid_Storage
-   ? Lob_HDFS_File : column->getLobStorage());
+  
  
-  //  lobTypList[j] = (short)
-  //CmpCommon::getDefaultNumeric(LOB_STORAGE_TYPE); 
+  lobTypList[j] = (short)(column->getLobStorage());
+ 
+
   char * loc = new (STMTHEAP) char[1024];
  
   const char* f = ActiveSchemaDB()->getDefaults().

[6/8] incubator-trafodion git commit: Merge remote branch 'origin/master'

2016-05-31 Thread sandhya

Merge remote branch 'origin/master'

Conflicts:
core/sql/regress/executor/EXPECTED130


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

Branch: refs/heads/master
Commit: db3ebf5d70156aa2d987656dc7231b0ebf9904d3
Parents: 5a3f202 7862d94
Author: Sandhya Sundaresan 
Authored: Fri May 27 06:45:37 2016 +
Committer: Sandhya Sundaresan 
Committed: Fri May 27 06:45:37 2016 +

--
 .gitattributes  |6 -
 .gitignore  |1 +
 .rat-excludes   |2 +-
 core/Makefile   |2 +-
 core/conn/Makefile  |5 +-
 core/conn/jdbcT4/Makefile   |1 +
 .../jdbcT4/src/main/java/T4Messages.properties  |6 +-
 .../java/org/trafodion/jdbc/t4/Address.java |2 +-
 .../jdbc/t4/HPT4ConnectionPoolDataSource.java   |  346 
 .../t4/HPT4ConnectionPoolDataSourceFactory.java |   68 -
 .../org/trafodion/jdbc/t4/HPT4DataSource.java   |  366 
 .../jdbc/t4/HPT4DataSourceFactory.java  |   62 -
 .../java/org/trafodion/jdbc/t4/HPT4Desc.java|  542 --
 .../org/trafodion/jdbc/t4/HPT4Exception.java|   38 -
 .../java/org/trafodion/jdbc/t4/HPT4Handle.java  |   84 -
 .../org/trafodion/jdbc/t4/HPT4Messages.java |  324 
 .../jdbc/t4/HPT4ParameterMetaData.java  |  243 ---
 .../trafodion/jdbc/t4/HPT4PooledConnection.java |  238 ---
 .../jdbc/t4/HPT4PooledConnectionManager.java|  385 
 .../jdbc/t4/HPT4ResultSetMetaData.java  |  309 ---
 .../jdbc/t4/InitializeDialogueReply.java|6 +-
 .../java/org/trafodion/jdbc/t4/InputOutput.java |   50 +-
 .../trafodion/jdbc/t4/InterfaceConnection.java  |   52 +-
 .../trafodion/jdbc/t4/InterfaceResultSet.java   |   34 +-
 .../trafodion/jdbc/t4/InterfaceStatement.java   |  148 +-
 .../java/org/trafodion/jdbc/t4/NCSAddress.java  |   22 +-
 .../jdbc/t4/PreparedStatementManager.java   |2 +-
 .../java/org/trafodion/jdbc/t4/T4Address.java   |   24 +-
 .../org/trafodion/jdbc/t4/T4Connection.java |   36 +-
 .../org/trafodion/jdbc/t4/T4DSProperties.java   |6 +-
 .../trafodion/jdbc/t4/T4DatabaseMetaData.java   |  132 +-
 .../java/org/trafodion/jdbc/t4/T4Driver.java|   14 +-
 .../org/trafodion/jdbc/t4/T4Properties.java |   20 +-
 .../java/org/trafodion/jdbc/t4/T4ResultSet.java |   12 +-
 .../java/org/trafodion/jdbc/t4/T4Statement.java |   20 +-
 .../org/trafodion/jdbc/t4/T4_Dcs_Cancel.java|2 +-
 .../org/trafodion/jdbc/t4/T4_Dcs_Connect.java   |   10 +-
 .../jdbc/t4/TrafT4CallableStatement.java|   58 +-
 .../org/trafodion/jdbc/t4/TrafT4Connection.java |  108 +-
 .../jdbc/t4/TrafT4ConnectionPoolDataSource.java |  346 
 .../TrafT4ConnectionPoolDataSourceFactory.java  |   68 +
 .../org/trafodion/jdbc/t4/TrafT4DataSource.java |  366 
 .../jdbc/t4/TrafT4DataSourceFactory.java|   62 +
 .../java/org/trafodion/jdbc/t4/TrafT4Desc.java  |  542 ++
 .../org/trafodion/jdbc/t4/TrafT4Exception.java  |   38 +
 .../org/trafodion/jdbc/t4/TrafT4Handle.java |   84 +
 .../org/trafodion/jdbc/t4/TrafT4Messages.java   |  324 
 .../jdbc/t4/TrafT4ParameterMetaData.java|  243 +++
 .../jdbc/t4/TrafT4PooledConnection.java |  238 +++
 .../jdbc/t4/TrafT4PooledConnectionManager.java  |  385 
 .../jdbc/t4/TrafT4PreparedStatement.java|  118 +-
 .../org/trafodion/jdbc/t4/TrafT4ResultSet.java  |  296 +--
 .../jdbc/t4/TrafT4ResultSetMetaData.java|  309 +++
 .../org/trafodion/jdbc/t4/TrafT4Statement.java  |   70 +-
 .../java/org/trafodion/jdbc/t4/Utility.java |   24 +-
 .../jdbc/t4/odbc_Dcs_GetObjRefHdl_exc_.java |   16 +-
 .../jdbc/t4/odbc_Dcs_StopSrvr_exc_.java |8 +-
 .../jdbc/t4/odbc_SQLSvc_Close_exc_.java |8 +-
 .../t4/odbc_SQLSvc_EndTransaction_exc_.java |8 +-
 .../jdbc/t4/odbc_SQLSvc_Execute_exc_.java   |   10 +-
 .../jdbc/t4/odbc_SQLSvc_Fetch_exc_.java |   10 +-
 .../t4/odbc_SQLSvc_GetSQLCatalogs_exc_.java |6 +-
 .../t4/odbc_SQLSvc_InitializeDialogue_exc_.java |6 +-
 .../jdbc/t4/odbc_SQLSvc_Prepare_exc_.java   |   10 +-
 .../odbc_SQLSvc_SetConnectionOption_exc_.java   |   12 +-
 .../t4/odbc_SQLSvc_TerminateDialogue_exc_.java  |8 +-
 .../java/org/trafodion/jdbc/t4/RunAllTests.java |2 +
 core/conn/jdbc_type2/native/SrvrCommon.cpp  |4 +-
 core/conn/odb/build.bat |   56 +
 core/conn/odb/odb/odb.vcxproj   |2 +
 core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.cpp |   39 +-

[1/8] incubator-trafodion git commit: Support for external lobs. Data files are stored externally in HDFS and only filehandles and file locations are stored in internal Trafodion tables.

2016-05-31 Thread sandhya

Repository: incubator-trafodion
Updated Branches:
  refs/heads/master c39d3abf6 -> 492f23f6f


Support for external lobs. Data files are stored externally in HDFS and only 
filehandles and file locations are stored in internal Trafodion tables.


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

Branch: refs/heads/master
Commit: 17c0530224a9be7b6aa4dcfba3b408423c3e9dd9
Parents: cdd1bef
Author: Sandhya Sundaresan 
Authored: Fri May 27 04:39:52 2016 +
Committer: Sandhya Sundaresan 
Committed: Fri May 27 04:39:52 2016 +

--
 core/sql/regress/executor/TEST130_argfile2 | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/17c05302/core/sql/regress/executor/TEST130_argfile2
--
diff --git a/core/sql/regress/executor/TEST130_argfile2 
b/core/sql/regress/executor/TEST130_argfile2
new file mode 100644
index 000..f123030
--- /dev/null
+++ b/core/sql/regress/executor/TEST130_argfile2
@@ -0,0 +1,3 @@
+TRAFODION.LOB130.tlob130ext
+c4
+lobc4ext.jpg

[5/8] incubator-trafodion git commit: Merge remote branch 'origin/master' into ansharma_hivets_br

2016-05-31 Thread ansharma

Merge remote branch 'origin/master' into ansharma_hivets_br

Conflicts:
core/sql/comexe/ComTdbHdfsScan.h
core/sql/generator/GenRelScan.cpp
core/sql/regress/hive/EXPECTED005


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

Branch: refs/heads/master
Commit: fa70e6831470cccfd86887f9607591f242512fa7
Parents: 1820da1 d199362
Author: Anoop Sharma 
Authored: Sat May 28 01:19:42 2016 +
Committer: Anoop Sharma 
Committed: Sat May 28 01:19:42 2016 +

--
 Makefile|   1 +
 core/Makefile   |  12 +-
 core/conn/jdbcT4/pom.xml|   7 +-
 .../jdbcT4/src/main/java/T4Messages.properties  |   4 +-
 core/conn/jdbc_type2/build.xml  |  11 +-
 core/conn/odbc/src/odbc/Makefile|   8 +-
 core/conn/trafci/install/Installer.java |   7 +-
 .../odbc/odbcclient/unixcli/makefile.lnx|   6 +-
 .../odbc/odbcclient/unixcli/package/TRAFDSN |   2 +-
 .../odbc/odbcclient/unixcli/package/mklnxpkg.sh |   2 +
 .../unixcli/package/runconnect_test.sh  |  26 +
 core/dbsecurity/scripts/sqcertgen   |   5 -
 core/dbsecurity/scripts/update_auth |   9 +-
 core/sqf/Makefile   |   2 +
 core/sqf/samples/.gitignore |   4 +
 core/sqf/sql/scripts/dcscheck   |  20 +-
 core/sqf/sql/scripts/install_traf_components|   3 +-
 core/sqf/sql/scripts/sqcheck|  57 +-
 core/sqf/sqvers |   2 +-
 core/sql/comexe/ComTdbFastTransport.h   |   4 +-
 core/sql/comexe/ComTdbHdfsScan.cpp  |  13 +-
 core/sql/comexe/ComTdbHdfsScan.h|  56 +-
 core/sql/common/ComSmallDefs.h  |   3 +
 core/sql/executor/ExFastTransport.cpp   |  18 +-
 core/sql/executor/ExHdfsScan.cpp|  38 +-
 core/sql/executor/hiveHook.cpp  |  27 +-
 core/sql/generator/GenFastTransport.cpp |   5 +-
 core/sql/generator/GenRelScan.cpp   |  32 +-
 core/sql/lib_mgmt/pom.xml   |   2 +-
 core/sql/optimizer/BindRelExpr.cpp  |  30 +-
 core/sql/optimizer/HDFSHook.cpp |   1 +
 core/sql/optimizer/HDFSHook.h   |   4 +
 core/sql/optimizer/RelFastTransport.cpp |   1 +
 core/sql/optimizer/RelFastTransport.h   |  18 +-
 core/sql/optimizer/hiveHook.h   |  25 +-
 core/sql/regress/core/EXPECTED162   |  22 +-
 core/sql/regress/hive/EXPECTED001   |  22 +-
 core/sql/regress/hive/EXPECTED003   | 244 
 core/sql/regress/hive/EXPECTED004   | 240 
 core/sql/regress/hive/EXPECTED005   |  10 +-
 core/sql/regress/hive/EXPECTED006   |  16 +-
 core/sql/regress/hive/EXPECTED015   |  64 +--
 core/sql/regress/hive/EXPECTED018   | 570 +++
 core/sql/regress/hive/TEST018   |  48 +-
 .../hive/TEST018_create_hive_tables.hive|  16 +-
 core/sql/regress/tools/runregr_hive.ksh |  39 +-
 core/sql/sqlcomp/DefaultConstants.h |   1 -
 core/sql/sqlcomp/nadefaults.cpp |   1 -
 core/sql/ustat/hs_globals.cpp   |  28 +-
 dcs/pom.xml |   8 +
 install/Makefile|  18 +-
 install/installer/traf_cloudera_mods|   1 -
 install/installer/traf_package_setup|   2 +-
 53 files changed, 1077 insertions(+), 738 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fa70e683/core/sql/comexe/ComTdbHdfsScan.cpp
--

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fa70e683/core/sql/comexe/ComTdbHdfsScan.h
--
diff --cc core/sql/comexe/ComTdbHdfsScan.h
index c60b192,70573e1..ac83311
--- a/core/sql/comexe/ComTdbHdfsScan.h
+++ b/core/sql/comexe/ComTdbHdfsScan.h
@@@ -131,18 -131,11 +131,18 @@@ class ComTdbHdfsScan : public ComTd
NABasicPtr loggingLocation_;// 168 - 175
NABasicPtr errCountRowId_;  // 176 - 183
UInt32  hiveScanMode_;  // 184 - 187
- 
-   char fillersComTdbHdfsScan1_[4];   // 188 - 191
+   UInt16 origTuppIndex_;

[7/8] incubator-trafodion git commit: hive data modification detection: commit #4

2016-05-31 Thread ansharma

hive data modification detection: commit #4


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

Branch: refs/heads/master
Commit: 51a9c73ed37c3711178483c4a200f17a92d1c08d
Parents: b1a8f02
Author: Anoop Sharma 
Authored: Tue May 31 18:03:40 2016 +
Committer: Anoop Sharma 
Committed: Tue May 31 18:03:40 2016 +

--
 core/sql/cli/SessionDefaults.cpp|   2 +
 core/sql/comexe/ComTdbExeUtil.cpp   |   6 +-
 core/sql/comexe/ComTdbExeUtil.h |  12 ++-
 core/sql/comexe/ComTdbHdfsScan.h|   4 +-
 core/sql/executor/ExExeUtil.h   |   9 +-
 core/sql/executor/ExExeUtilMisc.cpp |  95 ++-
 core/sql/executor/ExFastTransport.cpp   |   2 +-
 core/sql/executor/ExHdfsScan.cpp|   2 +-
 core/sql/exp/ExpErrorEnums.h|   1 +
 core/sql/exp/ExpLOBaccess.cpp   | 133 ---
 core/sql/exp/ExpLOBaccess.h |   5 +-
 core/sql/exp/ExpLOBinterface.h  |   5 +-
 core/sql/generator/GenFastTransport.cpp |   2 +-
 core/sql/generator/GenRelExeUtil.cpp|   5 +-
 core/sql/optimizer/BindRelExpr.cpp  |   3 +-
 core/sql/optimizer/HDFSHook.cpp |  50 --
 core/sql/optimizer/NATable.cpp  |   3 +
 core/sql/optimizer/RelExeUtil.h |   9 +-
 core/sql/optimizer/RelFastTransport.cpp |   1 +
 core/sql/regress/hive/EXPECTED003   |  37 ++--
 core/sql/regress/hive/EXPECTED005   |  36 +---
 core/sql/regress/hive/EXPECTED015   |  59 ++--
 core/sql/regress/hive/TEST003   |   9 +-
 core/sql/regress/hive/TEST005   |  11 +--
 core/sql/regress/hive/TEST015   |   3 +-
 25 files changed, 240 insertions(+), 264 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/51a9c73e/core/sql/cli/SessionDefaults.cpp
--
diff --git a/core/sql/cli/SessionDefaults.cpp b/core/sql/cli/SessionDefaults.cpp
index 024754b..5e79138 100644
--- a/core/sql/cli/SessionDefaults.cpp
+++ b/core/sql/cli/SessionDefaults.cpp
@@ -782,6 +782,8 @@ static const AQRInfo::AQRErrorMap aqrErrorMap[] =
   // parallel purgedata failed
   AQREntry(   8022,  0,  3,60,  0,   0, "",0, 1),
 
+  // hive data modification timestamp mismatch.
+  // query will be AQR'd and hive metadata will be reloaded.
   AQREntry(   8436,  0,  1, 0,  0,   2, "04:05",  0, 0),
 
   // FS memory errors

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/51a9c73e/core/sql/comexe/ComTdbExeUtil.cpp
--
diff --git a/core/sql/comexe/ComTdbExeUtil.cpp 
b/core/sql/comexe/ComTdbExeUtil.cpp
index 3442714..e3dd630 100644
--- a/core/sql/comexe/ComTdbExeUtil.cpp
+++ b/core/sql/comexe/ComTdbExeUtil.cpp
@@ -1189,7 +1189,8 @@ ComTdbExeUtilFastDelete::ComTdbExeUtilFastDelete(
  NABoolean isHiveTruncate,
  char * hiveTableLocation,
  char * hiveHostName,
- Lng32 hivePortNum)
+ Lng32 hivePortNum,
+ Int64 hiveModTS)
  : ComTdbExeUtil(ComTdbExeUtil::FAST_DELETE_,
 NULL, 0, (Int16)SQLCHARSETCODE_UNKNOWN,
 tableName, tableNameLen,
@@ -1211,7 +1212,8 @@ ComTdbExeUtilFastDelete::ComTdbExeUtilFastDelete(
lobNumArray_(lobNumArray),
hiveTableLocation_(hiveTableLocation),
hiveHdfsHost_(hiveHostName),
-   hiveHdfsPort_(hivePortNum)
+   hiveHdfsPort_(hivePortNum),
+   hiveModTS_(hiveModTS)
 {
   setIsHiveTruncate(isHiveTruncate);
   setNodeType(ComTdb::ex_FAST_DELETE);

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/51a9c73e/core/sql/comexe/ComTdbExeUtil.h
--
diff --git a/core/sql/comexe/ComTdbExeUtil.h b/core/sql/comexe/ComTdbExeUtil.h
index ea3ef69..eb70eac 100644
--- a/core/sql/comexe/ComTdbExeUtil.h
+++ b/core/sql/comexe/ComTdbExeUtil.h
@@ -1518,7 +1518,8 @@ public:
  NABoolean ishiveTruncate = FALSE,
  char * hiveTableLocation = NULL,
   char * hiveHostName = NULL,
-  Lng32 hivePortNum = 0
+  Lng32 hivePortNum = 0,
+  Int64 hiveModTS = -1
  );
 
   Long pack(void *);
@@ -1569,6 +1570,11 @@ public:
 return hiveHdfsPort_;
   }
 
+  Lng32 getHiveModTS() const
+  {
+return hiveModTS_;
+  }
+
   //

[8/8] incubator-trafodion git commit: Merge [TRAFODION-2006] PR-511 Handling of hive data and structure modification

2016-05-31 Thread ansharma

Merge [TRAFODION-2006] PR-511 Handling of hive data and structure modification


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

Branch: refs/heads/master
Commit: c39d3abf60ecb3734beb8fa83962016c01156057
Parents: d199362 51a9c73
Author: Anoop Sharma 
Authored: Tue May 31 22:51:56 2016 +
Committer: Anoop Sharma 
Committed: Tue May 31 22:51:56 2016 +

--
 core/sql/bin/SqlciErrors.txt|   2 +
 core/sql/cli/SessionDefaults.cpp|   6 +
 core/sql/comexe/ComTdbExeUtil.cpp   |   6 +-
 core/sql/comexe/ComTdbExeUtil.h |  12 +-
 core/sql/comexe/ComTdbFastTransport.cpp |   3 +-
 core/sql/comexe/ComTdbFastTransport.h   |   5 +-
 core/sql/comexe/ComTdbHdfsScan.cpp  |  49 ++-
 core/sql/comexe/ComTdbHdfsScan.h|  28 +++-
 core/sql/executor/ExExeUtil.h   |   9 +-
 core/sql/executor/ExExeUtilMisc.cpp |  95 +---
 core/sql/executor/ExFastTransport.cpp   |  87 +--
 core/sql/executor/ExFastTransport.h |   5 +
 core/sql/executor/ExHdfsScan.cpp|  81 ++-
 core/sql/executor/ExHdfsScan.h  |  13 +-
 core/sql/exp/ExpErrorEnums.h|   1 +
 core/sql/exp/ExpLOBaccess.cpp   | 158 +---
 core/sql/exp/ExpLOBaccess.h |  81 ++-
 core/sql/exp/ExpLOBenums.h  |   3 +
 core/sql/exp/ExpLOBinterface.cpp|  46 +-
 core/sql/exp/ExpLOBinterface.h  |  10 ++
 core/sql/generator/GenFastTransport.cpp |  62 
 core/sql/generator/GenRelExeUtil.cpp|   5 +-
 core/sql/generator/GenRelScan.cpp   |  57 +---
 core/sql/optimizer/BindRelExpr.cpp  |   3 +-
 core/sql/optimizer/HDFSHook.cpp |   5 +
 core/sql/optimizer/HDFSHook.h   |   7 +
 core/sql/optimizer/NATable.cpp  |  13 +-
 core/sql/optimizer/RelExeUtil.h |   9 +-
 core/sql/optimizer/RelFastTransport.cpp |   1 +
 core/sql/regress/executor/EXPECTED020   |   4 +
 core/sql/regress/hive/EXPECTED003   |  46 +++---
 core/sql/regress/hive/EXPECTED005   | 117 ---
 core/sql/regress/hive/EXPECTED006   |   3 -
 core/sql/regress/hive/EXPECTED015   |  59 
 core/sql/regress/hive/EXPECTED018   | 208 +++
 core/sql/regress/hive/TEST003   |  12 +-
 core/sql/regress/hive/TEST005   |  38 -
 core/sql/regress/hive/TEST006   |   1 -
 core/sql/regress/hive/TEST015   |   3 +-
 core/sql/regress/hive/TEST018   |   4 +-
 core/sql/sqlcomp/DefaultConstants.h |   4 +
 core/sql/sqlcomp/nadefaults.cpp |   2 +
 42 files changed, 1014 insertions(+), 349 deletions(-)
--

[6/8] incubator-trafodion git commit: hive data modification detection: commit #3

2016-05-31 Thread ansharma

hive data modification detection: commit #3


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

Branch: refs/heads/master
Commit: b1a8f024b5a3d4db368b51bbd2b6aac7035b9571
Parents: fa70e68
Author: Anoop Sharma 
Authored: Mon May 30 13:48:16 2016 +
Committer: Anoop Sharma 
Committed: Mon May 30 13:48:16 2016 +

--
 core/sql/comexe/ComTdbFastTransport.cpp |   3 +-
 core/sql/comexe/ComTdbFastTransport.h   |   5 +-
 core/sql/executor/ExFastTransport.cpp   |  87 +--
 core/sql/executor/ExFastTransport.h |   5 +
 core/sql/exp/ExpLOBaccess.cpp   | 155 +---
 core/sql/exp/ExpLOBaccess.h |   4 +-
 core/sql/generator/GenFastTransport.cpp |  60 +---
 core/sql/optimizer/HDFSHook.cpp |   3 +-
 core/sql/regress/hive/EXPECTED003   |   9 --
 core/sql/regress/hive/EXPECTED005   |   8 +-
 core/sql/regress/hive/EXPECTED006   |   3 -
 core/sql/regress/hive/EXPECTED018   | 208 +++
 core/sql/regress/hive/TEST003   |   3 -
 core/sql/regress/hive/TEST006   |   1 -
 core/sql/regress/hive/TEST018   |   4 +-
 15 files changed, 386 insertions(+), 172 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b1a8f024/core/sql/comexe/ComTdbFastTransport.cpp
--
diff --git a/core/sql/comexe/ComTdbFastTransport.cpp 
b/core/sql/comexe/ComTdbFastTransport.cpp
index d995fdb..f492e8f 100644
--- a/core/sql/comexe/ComTdbFastTransport.cpp
+++ b/core/sql/comexe/ComTdbFastTransport.cpp
@@ -98,7 +98,8 @@ ComTdbFastExtract::ComTdbFastExtract(
   hdfsIOBufferSize_(hdfBuffSize),
   hdfsReplication_(replication),
   ioTimeout_(ioTimeout),
-  childDataRowLen_(childDataRowLen)
+  childDataRowLen_(childDataRowLen),
+  modTSforDir_(-1)
 {
 
 }

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b1a8f024/core/sql/comexe/ComTdbFastTransport.h
--
diff --git a/core/sql/comexe/ComTdbFastTransport.h 
b/core/sql/comexe/ComTdbFastTransport.h
index 1ae7625..98e93eb 100644
--- a/core/sql/comexe/ComTdbFastTransport.h
+++ b/core/sql/comexe/ComTdbFastTransport.h
@@ -401,6 +401,8 @@ public:
 return childDataRowLen_;
   }
 
+  void setModTSforDir(Int64 v) { modTSforDir_ = v; }
+  Int64 getModTSforDir() const { return modTSforDir_; }
 
 protected:
   NABasicPtr   targetName_;  // 00 - 07
@@ -427,9 +429,10 @@ protected:
   UInt16   ioTimeout_;   // 128 - 129
   UInt16   filler_;  // 130 - 131
   UInt32   childDataRowLen_; // 132 - 135
+  Int64modTSforDir_; // 136 - 143
 
   // Make sure class size is a multiple of 8
-  char fillerComTdbFastTransport_[8];// 136 - 143
+  char fillerComTdbFastTransport_[8];// 144 - 151
 
 };
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b1a8f024/core/sql/executor/ExFastTransport.cpp
--
diff --git a/core/sql/executor/ExFastTransport.cpp 
b/core/sql/executor/ExFastTransport.cpp
index b881b14..45c3959 100644
--- a/core/sql/executor/ExFastTransport.cpp
+++ b/core/sql/executor/ExFastTransport.cpp
@@ -89,6 +89,7 @@ ExFastExtractTcb::ExFastExtractTcb(
   , sourceFieldsConvIndex_(NULL)
   , currBuffer_(NULL)
   , bufferAllocFailuresCount_(0)
+  , modTS_(-1)
 {
   
   ex_globals *stmtGlobals = getGlobals();
@@ -482,6 +483,16 @@ Lng32 ExHdfsFastExtractTcb::lobInterfaceCreate()
 
 }
 
+Lng32 ExHdfsFastExtractTcb::lobInterfaceDataModCheck()
+{
+  return ExpLOBinterfaceDataModCheck(lobGlob_,
+ targetLocation_,
+ hdfsHost_,
+ hdfsPort_,
+ myTdb().getModTSforDir(),
+ 0);
+}
+
 
 Lng32 ExHdfsFastExtractTcb::lobInterfaceClose()
 {
@@ -530,13 +541,13 @@ Int32 ExHdfsFastExtractTcb::fixup()
 
   ex_tcb::fixup();
 
-
   if(!myTdb().getSkipWritingToFiles() &&
  !myTdb().getBypassLibhdfs())
 
 ExpLOBinterfaceInit
   (lobGlob_, getGlobals()->getDefaultHeap(),TRUE);
 
+  modTS_ = myTdb().getModTSforDir();
 
   return 0;
 }
@@ -681,9 +692,62 @@ ExWorkProcRetcode ExHdfsFastExtractTcb::work()
 {
 case

[3/8] incubator-trafodion git commit: Merge remote branch 'origin/master' into ansharma_hivets_br

2016-05-31 Thread ansharma

Merge remote branch 'origin/master' into ansharma_hivets_br


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

Branch: refs/heads/master
Commit: 772b4a3410821f8dda0ce2cad10cc81c31ff6f1d
Parents: cb6a75c 7862d94
Author: Anoop Sharma 
Authored: Fri May 27 14:01:09 2016 +
Committer: Anoop Sharma 
Committed: Fri May 27 14:01:09 2016 +

--
 .gitattributes  |6 -
 .gitignore  |1 +
 .rat-excludes   |2 +-
 core/Makefile   |2 +-
 core/conn/Makefile  |5 +-
 core/conn/jdbcT4/Makefile   |1 +
 .../jdbcT4/src/main/java/T4Messages.properties  |6 +-
 .../java/org/trafodion/jdbc/t4/Address.java |2 +-
 .../jdbc/t4/HPT4ConnectionPoolDataSource.java   |  346 
 .../t4/HPT4ConnectionPoolDataSourceFactory.java |   68 -
 .../org/trafodion/jdbc/t4/HPT4DataSource.java   |  366 
 .../jdbc/t4/HPT4DataSourceFactory.java  |   62 -
 .../java/org/trafodion/jdbc/t4/HPT4Desc.java|  542 --
 .../org/trafodion/jdbc/t4/HPT4Exception.java|   38 -
 .../java/org/trafodion/jdbc/t4/HPT4Handle.java  |   84 -
 .../org/trafodion/jdbc/t4/HPT4Messages.java |  324 
 .../jdbc/t4/HPT4ParameterMetaData.java  |  243 ---
 .../trafodion/jdbc/t4/HPT4PooledConnection.java |  238 ---
 .../jdbc/t4/HPT4PooledConnectionManager.java|  385 
 .../jdbc/t4/HPT4ResultSetMetaData.java  |  309 ---
 .../jdbc/t4/InitializeDialogueReply.java|6 +-
 .../java/org/trafodion/jdbc/t4/InputOutput.java |   50 +-
 .../trafodion/jdbc/t4/InterfaceConnection.java  |   52 +-
 .../trafodion/jdbc/t4/InterfaceResultSet.java   |   34 +-
 .../trafodion/jdbc/t4/InterfaceStatement.java   |  148 +-
 .../java/org/trafodion/jdbc/t4/NCSAddress.java  |   22 +-
 .../jdbc/t4/PreparedStatementManager.java   |2 +-
 .../java/org/trafodion/jdbc/t4/T4Address.java   |   24 +-
 .../org/trafodion/jdbc/t4/T4Connection.java |   36 +-
 .../org/trafodion/jdbc/t4/T4DSProperties.java   |6 +-
 .../trafodion/jdbc/t4/T4DatabaseMetaData.java   |  132 +-
 .../java/org/trafodion/jdbc/t4/T4Driver.java|   14 +-
 .../org/trafodion/jdbc/t4/T4Properties.java |   20 +-
 .../java/org/trafodion/jdbc/t4/T4ResultSet.java |   12 +-
 .../java/org/trafodion/jdbc/t4/T4Statement.java |   20 +-
 .../org/trafodion/jdbc/t4/T4_Dcs_Cancel.java|2 +-
 .../org/trafodion/jdbc/t4/T4_Dcs_Connect.java   |   10 +-
 .../jdbc/t4/TrafT4CallableStatement.java|   58 +-
 .../org/trafodion/jdbc/t4/TrafT4Connection.java |  108 +-
 .../jdbc/t4/TrafT4ConnectionPoolDataSource.java |  346 
 .../TrafT4ConnectionPoolDataSourceFactory.java  |   68 +
 .../org/trafodion/jdbc/t4/TrafT4DataSource.java |  366 
 .../jdbc/t4/TrafT4DataSourceFactory.java|   62 +
 .../java/org/trafodion/jdbc/t4/TrafT4Desc.java  |  542 ++
 .../org/trafodion/jdbc/t4/TrafT4Exception.java  |   38 +
 .../org/trafodion/jdbc/t4/TrafT4Handle.java |   84 +
 .../org/trafodion/jdbc/t4/TrafT4Messages.java   |  324 
 .../jdbc/t4/TrafT4ParameterMetaData.java|  243 +++
 .../jdbc/t4/TrafT4PooledConnection.java |  238 +++
 .../jdbc/t4/TrafT4PooledConnectionManager.java  |  385 
 .../jdbc/t4/TrafT4PreparedStatement.java|  118 +-
 .../org/trafodion/jdbc/t4/TrafT4ResultSet.java  |  296 +--
 .../jdbc/t4/TrafT4ResultSetMetaData.java|  309 +++
 .../org/trafodion/jdbc/t4/TrafT4Statement.java  |   70 +-
 .../java/org/trafodion/jdbc/t4/Utility.java |   24 +-
 .../jdbc/t4/odbc_Dcs_GetObjRefHdl_exc_.java |   16 +-
 .../jdbc/t4/odbc_Dcs_StopSrvr_exc_.java |8 +-
 .../jdbc/t4/odbc_SQLSvc_Close_exc_.java |8 +-
 .../t4/odbc_SQLSvc_EndTransaction_exc_.java |8 +-
 .../jdbc/t4/odbc_SQLSvc_Execute_exc_.java   |   10 +-
 .../jdbc/t4/odbc_SQLSvc_Fetch_exc_.java |   10 +-
 .../t4/odbc_SQLSvc_GetSQLCatalogs_exc_.java |6 +-
 .../t4/odbc_SQLSvc_InitializeDialogue_exc_.java |6 +-
 .../jdbc/t4/odbc_SQLSvc_Prepare_exc_.java   |   10 +-
 .../odbc_SQLSvc_SetConnectionOption_exc_.java   |   12 +-
 .../t4/odbc_SQLSvc_TerminateDialogue_exc_.java  |8 +-
 .../java/org/trafodion/jdbc/t4/RunAllTests.java |2 +
 core/conn/odb/build.bat |   56 +
 core/conn/odb/odb/odb.vcxproj   |2 +
 core/rest/Makefile  |   16 +-
 core/rest/pom.xml   |   40 +-
 core/rest/src/assembly/all.xml  |   11 +-

[5/8] incubator-trafodion git commit: Merge remote branch 'origin/master'

[3/8] incubator-trafodion git commit: Support for external lobs. Data files are stored externally in HDFS and only filehandles and file locations are stored in internal Trafodion tables.

[4/8] incubator-trafodion git commit: Support for external lobs. Data files are stored externally in HDFS and only filehandles and file locations are stored in internal Trafodion tables.

[2/8] incubator-trafodion git commit: Support for external lobs. Data files are stored externally in HDFS and only filehandles and file locations are stored in internal Trafodion tables.

[6/8] incubator-trafodion git commit: Merge remote branch 'origin/master'

[1/8] incubator-trafodion git commit: Support for external lobs. Data files are stored externally in HDFS and only filehandles and file locations are stored in internal Trafodion tables.

[5/8] incubator-trafodion git commit: Merge remote branch 'origin/master' into ansharma_hivets_br

[7/8] incubator-trafodion git commit: hive data modification detection: commit #4

[8/8] incubator-trafodion git commit: Merge [TRAFODION-2006] PR-511 Handling of hive data and structure modification

[6/8] incubator-trafodion git commit: hive data modification detection: commit #3

[3/8] incubator-trafodion git commit: Merge remote branch 'origin/master' into ansharma_hivets_br

11 matches

Site Navigation

Mail list logo

Footer information