You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by li...@apache.org on 2018/04/13 12:38:41 UTC
[01/32] trafodion git commit: cherry-pick altercolumn
Repository: trafodion
Updated Branches:
refs/heads/master 3dd0eca44 -> 92476567f
cherry-pick altercolumn
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/ef73b771
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/ef73b771
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/ef73b771
Branch: refs/heads/master
Commit: ef73b7719c746bc721587f2b4b4a032d71d03c65
Parents: d538162
Author: liu.yu <yu...@esgyn.cn>
Authored: Tue Aug 15 12:12:48 2017 +0800
Committer: liu.yu <yu...@esgyn.cn>
Committed: Tue Aug 22 11:16:47 2017 +0800
----------------------------------------------------------------------
.../sql_functions_and_expressions.adoc | 22 ++++++++++----------
1 file changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/ef73b771/docs/sql_reference/src/asciidoc/_chapters/sql_functions_and_expressions.adoc
----------------------------------------------------------------------
diff --git a/docs/sql_reference/src/asciidoc/_chapters/sql_functions_and_expressions.adoc b/docs/sql_reference/src/asciidoc/_chapters/sql_functions_and_expressions.adoc
index 1dfe031..27d9f2c 100644
--- a/docs/sql_reference/src/asciidoc/_chapters/sql_functions_and_expressions.adoc
+++ b/docs/sql_reference/src/asciidoc/_chapters/sql_functions_and_expressions.adoc
@@ -503,7 +503,7 @@ ADD_MONTHS(timestamp'2008-02-29 00:00:00',12,1)
The ASCII function returns the integer that is the ASCII code of the
first character in a character string expression associated with either
-the ISO8891 character set or the UTF8 character set.
+the ISO88591 character set or the UTF8 character set.
ASCII is a {project-name} SQL extension.
@@ -720,7 +720,7 @@ The AUTHNAME function is similar to the <<user function,USER Function>>.
=== Considerations for AUTHNAME
* This function can be specified only in the top level of a SELECT statement.
-* The value returned is string data type VARCHAR(128) and is in ISO8859-1 encoding.
+* The value returned is string data type VARCHAR(128) and is in ISO88591 encoding.
[[examples_of_authname]]
=== Examples of AUTHNAME
@@ -1451,7 +1451,7 @@ CONCAT (character-expr-1, character-expr-2)
+
are SQL character value expressions (of data type CHAR or VARCHAR) that
specify two strings of characters. Both character value expressions must
-be either ISO8859-1 character expressions or UTF8 character expressions.
+be either ISO88591 character expressions or UTF8 character expressions.
The result of the CONCAT function is the concatenation of
_character-expr-1_ with _character-expr-2_. The result type is CHAR if
both expressions are of type CHAR and it is VARCHAR if either of the
@@ -1561,7 +1561,7 @@ the displayed output shows the internal value and is, consequently, not
particularly meaningful to general users and is subject to change in
future releases.
-CONVERTTOHEX returns ASCII characters in ISO8859-1 encoding.
+CONVERTTOHEX returns ASCII characters in ISO88591 encoding.
<<<
[[examples_of_converttohex]]
@@ -2079,7 +2079,7 @@ The CURRENT_USER function is similar to the <<user_function,USER Function>>.
=== Considerations for CURRENT_USER
* This function can be specified only in the top level of a SELECT statement.
-* The value returned is string data type VARCHAR(128) and is in ISO8859-1 encoding.
+* The value returned is string data type VARCHAR(128) and is in ISO88591 encoding.
[[examples_of_current_user]]
@@ -2429,7 +2429,7 @@ specifies a format for a datetime value. See <<datetime_literals,Datetime Litera
[[considerations_for_dateformat]]
=== Considerations for DATEFORMAT
-The DATEFORMAT function returns the datetime value in ISO8859-1
+The DATEFORMAT function returns the datetime value in ISO88591
encoding.
[[examples_of_dateformat]]
@@ -2690,7 +2690,7 @@ TIMESTAMP. See <<datetime_value_expressions,Datetime Value Expressions>>.
[[considerations_for_dayname]]
=== Considerations for DAYNAME
-The DAYNAME function returns the name of the day in ISO8859-1.
+The DAYNAME function returns the name of the day in ISO88591.
[[examples_of_dayname]]
=== Examples of DAYNAME
@@ -4641,7 +4641,7 @@ TIMESTAMP. See <<datetime_value_expressions,Datetime Value Expressions>>.
[[considerations_for_monthname]]
=== Considerations for MONTHNAME
-The MONTHNAME function returns the name of the month in ISO8859-1.
+The MONTHNAME function returns the name of the month in ISO88591.
[[examples_of_monthname]]
=== Examples of MONTHNAME
@@ -6899,7 +6899,7 @@ SPACE (length [, char-set-name])
+
specifies the number of characters to be returned. The number _count_
must be a value greater than or equal to zero of exact numeric data type
-and with a scale of zero. _length_ cannot exceed 32768 for the ISO8859-1
+and with a scale of zero. _length_ cannot exceed 32768 for the ISO88591
or UTF8 character sets.
* `_char-set-name_`
@@ -7827,7 +7827,7 @@ is one of these translation names:
[cols="25%l,25%l,25%l,25%",options="header"]
|===
| Translation Name | Source Character Set | Target Character Set | Comments
-| ISO88591TOUTF8 | ISO88591 | UTF8 | Translates ISO8859-1 characters to UTF8 characters. No data loss is possible.
+| ISO88591TOUTF8 | ISO88591 | UTF8 | Translates ISO88591 characters to UTF8 characters. No data loss is possible.
| UTF8TOISO88591 | UTF8 | ISO88591 | Translates UTF8 characters to ISO88591 characters. {project-name} SQL will
display an error if it encounters a Unicode character that cannot be converted to the target character set.
|===
@@ -8127,7 +8127,7 @@ and the <<current_user_function,CURRENT USER Function>>.
=== Considerations for USER
* This function can be specified only in the top level of a SELECT statement.
-* The value returned is string data type VARCHAR(128) and is in ISO8859-1 encoding.
+* The value returned is string data type VARCHAR(128) and is in ISO88591 encoding.
[[examples_of_user]]
=== Examples of USER
[09/32] trafodion git commit: Main change:
Posted by li...@apache.org.
Main change:
Added a method for JDBC driver to be able to close an open cursor abruptly by passing in a 0 length to the extract syntax. This will ensure internal opens are not left around if the application does not retrieve all the data with the stream API.
This abrupt close can be called when the result set is closed or the connection is closed by keeping track of all the open Blob objects. (in the driver)
Added a freeResources method and destructor to LobExtract and LobUpdate Tcbs.
Minor changes and fixes :
Refactored the ExLob::closeCursor
Removed the LOB_CLI_SELECT_CLOSE call from ::fetchCursor so it gets closed only when ExLob::closeCursor is called. Makes the code consistent and readable.
Took care of a few memory allocations and deletions.
Refactored the LOB length calculation into on ecommon method so it works correctly for both regular LOB dat aas well as external LOB files. Earlier the external lobs length was being returned incorrectly. Now it reports the length of the external HDFS file .
Fixed one place in generator where the CQD value was not being multiplied by the MB units correctly.
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/f1864484
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/f1864484
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/f1864484
Branch: refs/heads/master
Commit: f18644841f8d3c8aaa5c594c1018798d515821b0
Parents: 8a260f4
Author: Sandhya Sundaresan <sa...@apache.org>
Authored: Thu Aug 31 20:03:05 2017 +0000
Committer: Sandhya Sundaresan <sa...@apache.org>
Committed: Thu Aug 31 20:03:05 2017 +0000
----------------------------------------------------------------------
core/sql/cli/Cli.cpp | 5 +-
core/sql/clitest/blobtest.cpp | 12 +-
core/sql/executor/ExExeUtil.h | 5 +-
core/sql/executor/ExExeUtilLoad.cpp | 229 +++++++++++++++++++----------
core/sql/exp/ExpLOBaccess.cpp | 146 +++++++++++++-----
core/sql/exp/ExpLOBaccess.h | 4 +-
core/sql/exp/ExpLOBenums.h | 4 +-
core/sql/exp/ExpLOBinterface.cpp | 57 ++++++-
core/sql/exp/ExpLOBinterface.h | 13 ++
core/sql/generator/GenRelExeUtil.cpp | 2 +-
core/sql/regress/executor/EXPECTED130 | 78 +++++-----
11 files changed, 394 insertions(+), 161 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/f1864484/core/sql/cli/Cli.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/Cli.cpp b/core/sql/cli/Cli.cpp
index 1a6eaf5..a25a31b 100644
--- a/core/sql/cli/Cli.cpp
+++ b/core/sql/cli/Cli.cpp
@@ -10261,7 +10261,10 @@ Lng32 SQLCLI_LOBcliInterface
NADELETEBASIC(query, currContext.exHeap());
if (NOT (inCliInterface && (*inCliInterface)))
- delete cliInterface;
+ {
+ delete cliInterface;
+ cliInterface = NULL;
+ }
if (cliRC < 0)
{
http://git-wip-us.apache.org/repos/asf/trafodion/blob/f1864484/core/sql/clitest/blobtest.cpp
----------------------------------------------------------------------
diff --git a/core/sql/clitest/blobtest.cpp b/core/sql/clitest/blobtest.cpp
index a9a457a..492bbd6 100644
--- a/core/sql/clitest/blobtest.cpp
+++ b/core/sql/clitest/blobtest.cpp
@@ -92,7 +92,7 @@ Int32 extractLobToBuffer(CliGlobals *cliglob, char * lobHandle, Int64 &lengthOfL
while ((retcode != 100) && !(retcode<0))
{
retcode = cliInterface.clearExecFetchClose(NULL,NULL,statusBuf, &statusBufLen);
- if (!retcode)
+ if (retcode>= 0)
{
memcpy((char*)&(lobFinalBuf[i]),(char *)lobDataBuf,lobExtractLen);
i += lobExtractLen;
@@ -107,6 +107,9 @@ Int32 extractLobToBuffer(CliGlobals *cliglob, char * lobHandle, Int64 &lengthOfL
fclose(lobFileId);
}
+ str_sprintf(query,"extract lobtobuffer(lob '%s', LOCATION %Ld, SIZE 0) ", lobHandle, (Int64)lobDataBuf);
+
+ cliInterface.clearExecFetchClose(NULL,NULL,statusBuf, &statusBufLen);
delete lobFinalBuf;
delete query;
delete lobDataBuf;
@@ -142,13 +145,16 @@ Int32 extractLobToFileInChunks(CliGlobals *cliglob, char * lobHandle, char *fil
while ((retcode != 100) && !(retcode<0))
{
retcode = cliInterface.clearExecFetchClose(NULL,NULL,statusBuf, &statusBufLen);
- if (!retcode)
+ if (retcode>= 0)
{
byteCount=fwrite(lobDataBuf,sizeof(char),*inputOutputAddr, lobFileId);
cout << "Wrote " << byteCount << " bytes to file : " << filename << endl;
}
}
-
+ lobExtractLen = 0;
+ str_sprintf(query,"extract lobtobuffer(lob '%s', LOCATION %Ld, SIZE %Ld) ", lobHandle, (Int64)lobDataBuf, inputOutputAddr);
+ retcode = cliInterface.executeImmediatePrepare(query);
+ cliInterface.clearExecFetchClose(NULL,NULL,statusBuf, &statusBufLen);
fclose(lobFileId);
http://git-wip-us.apache.org/repos/asf/trafodion/blob/f1864484/core/sql/executor/ExExeUtil.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExExeUtil.h b/core/sql/executor/ExExeUtil.h
index 1ca9c97..07d3b22 100644
--- a/core/sql/executor/ExExeUtil.h
+++ b/core/sql/executor/ExExeUtil.h
@@ -2931,6 +2931,8 @@ public:
ex_globals * glob = 0);
virtual short work();
+ virtual ~ExExeUtilLobExtractTcb();
+ virtual void freeResources();
ExExeUtilLobExtractTdb & lobTdb() const
{
@@ -3036,7 +3038,8 @@ public:
ex_globals * glob = 0);
virtual short work();
-
+ virtual ~ExExeUtilLobUpdateTcb();
+ virtual void freeResources();
ExExeUtilLobUpdateTdb & lobTdb() const
{
return (ExExeUtilLobUpdateTdb &) tdb;
http://git-wip-us.apache.org/repos/asf/trafodion/blob/f1864484/core/sql/executor/ExExeUtilLoad.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExExeUtilLoad.cpp b/core/sql/executor/ExExeUtilLoad.cpp
index 45a15e5..614adde 100644
--- a/core/sql/executor/ExExeUtilLoad.cpp
+++ b/core/sql/executor/ExExeUtilLoad.cpp
@@ -2749,6 +2749,45 @@ ExExeUtilLobExtractTcb::ExExeUtilLobExtractTcb
}
+void ExExeUtilLobExtractTcb::freeResources()
+{
+ Lng32 cliRC = 0;
+ Lng32 retcode = 0;
+ void * lobGlobs = getLobGlobals()->lobAccessGlobals();
+ ContextCli *currContext =
+ getGlobals()->castToExExeStmtGlobals()->castToExMasterStmtGlobals()->
+ getStatement()->getContext();
+ //close any open cursors.
+ retcode = ExpLOBInterfaceSelectCursor
+ (lobGlobs,
+ lobName_,
+ lobLoc_,
+ lobType_,
+ lobTdb().getLobHdfsServer(),
+ lobTdb().getLobHdfsPort(),
+
+ lobHandleLen_, lobHandle_,
+ 0, //cursor bytes
+ NULL, //cursor id
+ requestTag_,
+ Lob_Buffer,
+ 0, // not check status
+ 1, // waited op
+
+ 0, lobDataSpecifiedExtractLen_,
+ lobDataLen_, lobData_,
+ 3, // close
+ 0); // open type not applicable
+
+ NADELETE(lobGlobals_,LOBglobals,currContext->exHeap());
+ lobGlobals_ = NULL;
+}
+
+ExExeUtilLobExtractTcb::~ExExeUtilLobExtractTcb()
+{
+ freeResources();
+}
+
short ExExeUtilLobExtractTcb::work()
{
Lng32 cliRC = 0;
@@ -2996,7 +3035,49 @@ short ExExeUtilLobExtractTcb::work()
}
}
-
+ Int16 flags;
+ Lng32 lobNum;
+ Int64 uid, inDescSyskey, descPartnKey;
+ short schNameLen;
+ char schName[1024];
+ ExpLOBoper::extractFromLOBhandle(&flags, &lobType_, &lobNum, &uid,
+ &inDescSyskey, &descPartnKey,
+ &schNameLen, (char *)schName,
+ (char *)lobHandle_, (Lng32)lobHandleLen_);
+
+ //Retrieve the lobLocation for this lobNum which will be used
+ //in the other steps_ which open and read lob data file.
+ short *lobNumList = new (getHeap()) short[1];
+ short *lobTypList = new (getHeap()) short[1];
+ char **lobLocList = new (getHeap()) char*[1];
+ char **lobColNameList = new (getHeap()) char*[1];
+ lobLocList[0] = new (getHeap()) char[1024];
+ lobColNameList[0] = new (getHeap()) char[256];
+
+ Lng32 numLobs = lobNum;
+ Lng32 cliRC = SQL_EXEC_LOBddlInterface
+ (
+ schName,
+ schNameLen,
+ uid,
+ numLobs,
+ LOB_CLI_SELECT_UNIQUE,
+ lobNumList,
+ lobTypList,
+ lobLocList,lobColNameList,lobTdb().getLobHdfsServer(),
+ lobTdb().getLobHdfsPort(),0,FALSE);
+ if (cliRC < 0)
+ {
+ getDiagsArea()->mergeAfter(diags);
+
+ step_ = HANDLE_ERROR_;
+ break;
+ }
+
+ strcpy(lobLoc_, lobLocList[0]);
+ NADELETEBASIC(lobColNameList[0],getHeap());
+ NADELETEBASIC(lobNumList,getHeap());
+ NADELETEBASIC(lobTypList,getHeap());
if (lobTdb().getToType() == ComTdbExeUtilLobExtract::TO_BUFFER_)
step_ = EXTRACT_LOB_DATA_;
else
@@ -3029,28 +3110,31 @@ short ExExeUtilLobExtractTcb::work()
&schNameLen, (char *)schName,
(char *)lobHandle_, (Lng32)lobHandleLen_);
-
- //Retrieve the total length of this lob using the handle info and return to the caller
- Int64 dummy = 0;
- cliRC = SQL_EXEC_LOBcliInterface(lobHandle_, lobHandleLen_,NULL,NULL,NULL,NULL,LOB_CLI_SELECT_LOBLENGTH,LOB_CLI_ExecImmed, 0,&lobDataLen_, &dummy, &dummy,0,0,FALSE);
- if (cliRC < 0)
- {
- getDiagsArea()->mergeAfter(diags);
-
- step_ = HANDLE_ERROR_;
- break;
- }
- if (lobTdb().retrieveLength())
- {
- if ((lobTdb().getBufAddr() != -1) && (lobTdb().getBufAddr() != 0))
- str_cpy_all((char *)lobTdb().getBufAddr(), (char *)&lobDataLen_,sizeof(Int64));
- str_sprintf(statusString_," LOB Length : %d", lobDataLen_);
- step_ = RETURN_STATUS_;
- break;
- }
- else
- step_ = EXTRACT_LOB_DATA_;
- break;
+
+ lobName_ = ExpLOBoper::ExpGetLOBname(uid, lobNum, lobNameBuf_, 1000);
+
+ //Retrieve the total length of this lob using the handle info and return to the caller
+
+ retcode = ExpLOBInterfaceGetLobLength( lobGlobs,
+ lobName_,
+ lobLoc_,
+ lobType_,
+ lobTdb().getLobHdfsServer(),
+ lobTdb().getLobHdfsPort(),
+ lobHandleLen_, lobHandle_,
+ lobDataLen_);
+
+ if (lobTdb().retrieveLength())
+ {
+ if ((lobTdb().getBufAddr() != -1) && (lobTdb().getBufAddr() != 0))
+ str_cpy_all((char *)lobTdb().getBufAddr(), (char *)&lobDataLen_,sizeof(Int64));
+ str_sprintf(statusString_," LOB Length : %d", lobDataLen_);
+ step_ = RETURN_STATUS_;
+ break;
+ }
+ else
+ step_ = EXTRACT_LOB_DATA_;
+ break;
}
case EXTRACT_LOB_DATA_ :
@@ -3069,38 +3153,16 @@ short ExExeUtilLobExtractTcb::work()
lobDataSpecifiedExtractLen_ = lobTdb().totalBufSize_;
-
+ if (lobDataSpecifiedExtractLen_ == 0)
+ {
+ // Passed in length is 0 indicates the caller is done with
+ // this lobhandle and wants to close this cursor
+ step_ = CLOSE_CURSOR_;
+ break;
+ }
- short *lobNumList = new (getHeap()) short[1];
- short *lobTypList = new (getHeap()) short[1];
- char **lobLocList = new (getHeap()) char*[1];
- char **lobColNameList = new (getHeap()) char*[1];
- lobLocList[0] = new (getHeap()) char[1024];
- lobColNameList[0] = new (getHeap()) char[256];
-
- Lng32 numLobs = lobNum;
- Lng32 cliRC = SQL_EXEC_LOBddlInterface
- (
- schName,
- schNameLen,
- uid,
- numLobs,
- LOB_CLI_SELECT_UNIQUE,
- lobNumList,
- lobTypList,
- lobLocList,lobColNameList,lobTdb().getLobHdfsServer(),
- lobTdb().getLobHdfsPort(),0,FALSE);
- if (cliRC < 0)
- {
- getDiagsArea()->mergeAfter(diags);
-
- step_ = HANDLE_ERROR_;
- break;
- }
-
- strcpy(lobLoc_, lobLocList[0]);
-
+
// Read the lob contents into target file
@@ -3204,6 +3266,15 @@ short ExExeUtilLobExtractTcb::work()
if (lobTdb().getToType() == ComTdbExeUtilLobExtract::TO_BUFFER_)
so = Lob_Buffer;
lobDataSpecifiedExtractLen_ = *((Int64 *)(lobTdb().dataExtractSizeIOAddr()));
+
+ if (lobDataSpecifiedExtractLen_ == 0)
+ {
+ // Passed in length is 0 indicates the caller is done with
+ // this lobhandle and wants to close this cursor
+ step_ = CLOSE_CURSOR_;
+ break;
+ }
+
retcode = ExpLOBInterfaceSelectCursor
(lobGlobs,
lobName_,
@@ -3420,6 +3491,18 @@ ExExeUtilLobUpdateTcb::ExExeUtilLobUpdateTcb
currContext->exHeap(),currContext,lobTdb().getLobHdfsServer(),
lobTdb().getLobHdfsPort());
}
+ExExeUtilLobUpdateTcb::~ExExeUtilLobUpdateTcb()
+{
+ freeResources();
+}
+
+void ExExeUtilLobUpdateTcb::freeResources()
+{
+ ContextCli *currContext =
+ getGlobals()->castToExExeStmtGlobals()->castToExMasterStmtGlobals()->
+ getStatement()->getContext();
+ NADELETE(lobGlobals_,LOBglobals,currContext->exHeap());
+}
short ExExeUtilLobUpdateTcb::work()
{
@@ -3538,7 +3621,7 @@ short ExExeUtilLobUpdateTcb::work()
char **lobColNameList = new (getHeap()) char*[1];
lobLocList[0] = new (getHeap()) char[1024];
lobColNameList[0] = new (getHeap()) char[256];
-
+
Lng32 numLobs = lobNum;
Lng32 cliRC = SQL_EXEC_LOBddlInterface
(
@@ -3560,6 +3643,10 @@ short ExExeUtilLobUpdateTcb::work()
}
strcpy(lobLoc_, lobLocList[0]);
+ NADELETEBASIC(lobLocList[0],getHeap());
+ NADELETEBASIC(lobColNameList[0],getHeap());
+ NADELETEBASIC(lobNumList,getHeap());
+ NADELETEBASIC(lobTypList,getHeap());
char outLobHandle[LOB_HANDLE_LEN];
Int32 outHandleLen;
Int64 requestTag = 0;
@@ -3652,6 +3739,10 @@ short ExExeUtilLobUpdateTcb::work()
}
strcpy(lobLoc_, lobLocList[0]);
+ NADELETEBASIC(lobLocList[0],getHeap());
+ NADELETEBASIC(lobColNameList[0],getHeap());
+ NADELETEBASIC(lobNumList,getHeap());
+ NADELETEBASIC(lobTypList,getHeap());
char outLobHandle[LOB_HANDLE_LEN];
Int32 outHandleLen;
Int64 requestTag = 0;
@@ -3744,33 +3835,15 @@ short ExExeUtilLobUpdateTcb::work()
}
strcpy(lobLoc_, lobLocList[0]);
+ NADELETEBASIC(lobLocList[0],getHeap());
+ NADELETEBASIC(lobColNameList[0],getHeap());
+ NADELETEBASIC(lobNumList,getHeap());
+ NADELETEBASIC(lobTypList,getHeap());
+
char outLobHandle[LOB_HANDLE_LEN];
Int32 outHandleLen;
Int64 requestTag = 0;
- /* retcode = ExpLOBInterfaceDelete(lobGlobs,
- lobTdb().getLobHdfsServer(),
- lobTdb().getLobHdfsPort(),
- lobName_,
- lobLoc_,
- lobHandleLen_,
- lobHandle_,
- requestTag_,
- getLobGlobals()->xnId(),
- inDescSyskey,
- 0,1);
- if (retcode < 0)
- {
- Lng32 cliError = 0;
-
- Lng32 intParam1 = -retcode;
- ComDiagsArea * diagsArea = getDiagsArea();
- ExRaiseSqlError(getHeap(), &diagsArea,
- (ExeErrorCode)(8442), NULL, &intParam1,
- &cliError, NULL, (char*)"ExpLOBInterfaceUpdate",
- getLobErrStr(intParam1));
- step_ = HANDLE_ERROR_;
- break;
- } */
+
retcode = ExpLOBInterfaceUpdate(lobGlobs,
lobTdb().getLobHdfsServer(),
lobTdb().getLobHdfsPort(),
http://git-wip-us.apache.org/repos/asf/trafodion/blob/f1864484/core/sql/exp/ExpLOBaccess.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpLOBaccess.cpp b/core/sql/exp/ExpLOBaccess.cpp
index 9478c64..af2846c 100644
--- a/core/sql/exp/ExpLOBaccess.cpp
+++ b/core/sql/exp/ExpLOBaccess.cpp
@@ -230,21 +230,6 @@ Ex_Lob_Error ExLob::fetchCursor(char *handleIn, Int32 handleLenIn, Int64 &outOff
if (cliErr == 100 )
{
isEOD= TRUE;
- cliErr = SQL_EXEC_LOBcliInterface(handleIn, handleLenIn,
- NULL, NULL,
- (char *)&dummyParam, (Lng32 *)&dummyParam,
- LOB_CLI_SELECT_CLOSE, LOB_CLI_ExecImmed,
- &dummyParam, &dummyParam,
- &dummyParam, &dummyParam,
- &cliInterface,
- transId,lobTrace_);
- if (cliErr <0 )
- {
- str_sprintf(logBuf, "LOB_CLI_SELECT_CLOSE Returned cli error %d",cliErr);
- lobDebugInfo(logBuf,0,__LINE__,lobTrace_);
- err = LOB_DESC_READ_ERROR;
- return err;
- }
}
else
@@ -256,9 +241,17 @@ Ex_Lob_Error ExLob::fetchCursor(char *handleIn, Int32 handleLenIn, Int64 &outOff
char temp[blackBoxLen+1];
str_cpy_and_null(temp, blackBox, blackBoxLen, '\0', '0', TRUE);
lobDataFile_ = temp;
+ outOffset = offset;
+ err=statSourceFile(temp,outSize);
+ if (err != LOB_OPER_OK)
+ return err;
}
- outOffset = offset;
- outSize = size;
+ else
+ {
+ outOffset = offset;
+ outSize = size;
+ }
+
}
str_sprintf(logBuf, " Returned after ::fetchCursor %Ld,%Ld",outOffset,outSize);
@@ -804,6 +797,62 @@ Ex_Lob_Error ExLob::readExternalSourceFile(char *srcfile, char *&fileData, Int32
return LOB_OPER_OK;
}
+Ex_Lob_Error ExLob::getLength(char *handleIn, Int32 handleInLen,Int64 &outLobLen,LobsSubOper so, Int64 transId)
+{
+ char logBuf[4096];
+ Int32 cliErr = 0;
+ Ex_Lob_Error err=LOB_OPER_OK;
+ char *blackBox = new(getLobGlobalHeap()) char[MAX_LOB_FILE_NAME_LEN+6];
+ Int32 blackBoxLen = 0;
+ Int64 dummy = 0;
+ Int32 dummy2 = 0;
+ if (so != Lob_External_File)
+ {
+
+ cliErr = SQL_EXEC_LOBcliInterface(handleIn, handleInLen,NULL,NULL,NULL,NULL,LOB_CLI_SELECT_LOBLENGTH,LOB_CLI_ExecImmed, 0,&outLobLen, 0, 0,0,transId,lobTrace_);
+
+ if (cliErr < 0 ) {
+ str_sprintf(logBuf,"CLI SELECT_LOBLENGTH returned error %d",cliErr);
+ lobDebugInfo(logBuf, 0,__LINE__,lobTrace_);
+
+ return LOB_DESC_READ_ERROR;
+ }
+ }
+ else
+ {
+ //Get the lob external filename from the descriptor file and get the length of the file
+ cliErr = SQL_EXEC_LOBcliInterface(handleIn,
+ handleInLen,
+ blackBox, &blackBoxLen,
+ NULL, 0,
+ LOB_CLI_SELECT_UNIQUE, LOB_CLI_ExecImmed,
+ &dummy, &dummy,
+ &dummy, &dummy,
+ 0,
+ transId,lobTrace_);
+ if (cliErr < 0 ) {
+ str_sprintf(logBuf,"CLI SELECT_LOBLENGTH returned error %d",cliErr);
+ lobDebugInfo(logBuf, 0,__LINE__,lobTrace_);
+
+ return LOB_DESC_READ_ERROR;
+ }
+ if (blackBox && blackBoxLen >0 )
+ {
+ // we have received the external data file name from the
+ // descriptor table
+
+ char temp[blackBoxLen+1];
+ str_cpy_and_null(temp, blackBox, blackBoxLen, '\0', '0', TRUE);
+
+
+ err=statSourceFile(temp,outLobLen);
+ if (err != LOB_OPER_OK)
+ return err;
+ }
+
+ }
+ return err;
+}
Ex_Lob_Error ExLob::writeDesc(Int64 &sourceLen, char *source, LobsSubOper subOper, Int64 &descNumOut, Int64 &operLen, Int64 lobMaxSize,Int64 lobMaxChunkMemSize,Int64 lobGCLimit, char * handleIn, Int32 handleInLen, char *blackBox, Int32 *blackBoxLen, char *handleOut, Int32 &handleOutLen, Int64 xnId, void *lobGlobals)
{
Ex_Lob_Error err=LOB_OPER_OK;
@@ -1566,7 +1615,7 @@ Ex_Lob_Error ExLob::readCursor(char *tgt, Int64 tgtSize, char *handleIn, Int32 h
if (cursor.eod_) {
// remove cursor from the map.
// server has already closed the cursor.
- closeCursor(handleIn, handleInLen);
+ closeCursor(handleIn, handleInLen,transId);
// indicate EOD to SQL
operLen = 0;
return LOB_OPER_OK;
@@ -1585,17 +1634,48 @@ Ex_Lob_Error ExLob::readCursor(char *tgt, Int64 tgtSize, char *handleIn, Int32 h
-Ex_Lob_Error ExLob::closeCursor(char *handleIn, Int32 handleInLen)
+Ex_Lob_Error ExLob::closeCursor(char *handleIn, Int32 handleInLen, Int64 transId)
{
char logBuf[4096];
+ Int64 dummyParam = 0;
+ Int32 cliErr = 0;
+ Ex_Lob_Error err = LOB_OPER_OK;
lobCursors_it it = lobCursors_.find(string(handleIn, handleInLen));
+ if (it == lobCursors_.end())
+ {
+ // cursor already closed
+ return LOB_OPER_OK;
+ }
+
+ void *cliInterface = it->second.cliInterface_;
+ if (cliInterface)
+ {
+ cliErr = SQL_EXEC_LOBcliInterface(handleIn, handleInLen,
+ NULL, NULL,
+ (char *)&dummyParam, (Lng32 *)&dummyParam,
+ LOB_CLI_SELECT_CLOSE, LOB_CLI_ExecImmed,
+ &dummyParam, &dummyParam,
+ &dummyParam, &dummyParam,
+ &cliInterface,
+ transId,lobTrace_);
+ if (cliErr <0 )
+ {
+ str_sprintf(logBuf, "LOB_CLI_SELECT_CLOSE Returned cli error %d",cliErr);
+ lobDebugInfo(logBuf,0,__LINE__,lobTrace_);
+ err = LOB_DESC_READ_ERROR;
+ return err;
+ }
+ }
if (it != lobCursors_.end())
{
str_sprintf(logBuf,"closing cursor for handle");
lobDebugInfo(logBuf,0,__LINE__,lobTrace_);
lobCursors_.erase(it);
}
- return LOB_OPER_OK;
+
+
+
+ return LOB_OPER_OK;
}
Ex_Lob_Error ExLob::allocateDesc(ULng32 size, Int64 &descNum, Int64 &dataOffset, Int64 lobMaxSize, Int64 lobMaxChunkMemLen, char *handleIn, Int32 handleInLen, Int64 lobGCLimit, void *lobGlobals)
@@ -1949,7 +2029,7 @@ Ex_Lob_Error ExLob::readCursorData(char *tgt, Int64 tgtSize, cursor_t &cursor, I
char logBuf[4096];
lobDebugInfo("In ExLob::readCursorData",0,__LINE__,lobTrace_);
- while ( (operLen <= tgtSize) && !cursor.eod_ )
+ while ( (operLen < tgtSize) && !cursor.eod_ )
{
if (cursor.bytesRead_ == cursor.descSize_) // time to read next chunck
@@ -1970,14 +2050,7 @@ Ex_Lob_Error ExLob::readCursorData(char *tgt, Int64 tgtSize, cursor_t &cursor, I
continue;
}
}
- if (operLen == tgtSize)
- {
- //The cursor still has data available but wait until redrive since
- //we have fetched all the data for this extract operation
- hdfsCloseFile(fs_, fdData_);
- fdData_ = NULL;
- return LOB_OPER_OK;
- }
+
bytesAvailable = cursor.descSize_ - cursor.bytesRead_;
bytesToCopy = min(bytesAvailable, tgtSize - operLen);
offset = cursor.descOffset_ + cursor.bytesRead_;
@@ -2028,6 +2101,7 @@ Ex_Lob_Error ExLob::readCursorData(char *tgt, Int64 tgtSize, cursor_t &cursor, I
operLen += bytesRead;
tgt += bytesRead;
}
+
hdfsCloseFile(fs_, fdData_);
fdData_ = NULL;
return LOB_OPER_OK;
@@ -2117,7 +2191,7 @@ Ex_Lob_Error ExLob::readDataToMem(char *memAddr,
if (err==LOB_OPER_OK)
closeCursor(handleIn,
- handleLenIn);
+ handleLenIn,transId);
else
return err;
}
@@ -2232,7 +2306,7 @@ Ex_Lob_Error ExLob::readDataToLocalFile(char *fileName, Int64 offset, Int64 siz
tgtOffset += chunkSize;
}
closeCursor(handleIn,
- handleInLen);
+ handleInLen,transId);
}
close(fdDestFile);
return LOB_OPER_OK;
@@ -2359,7 +2433,7 @@ Ex_Lob_Error ExLob::readDataToHdfsFile(char *tgtFileName, Int64 offset, Int64 s
}
closeCursor(handleIn,
- handleInLen);
+ handleInLen,transId);
}
hdfsCloseFile(fs_, fdTgtFile);
fdTgtFile=NULL;
@@ -2644,7 +2718,11 @@ Ex_Lob_Error ExLobsOper (
if (blackBox)
(lobGlobals->getHeap())->deallocateMemory((char*) blackBox);
break;
-
+ case Lob_GetLength:
+ {
+ err = lobPtr->getLength(handleIn, handleInLen,retOperLen,subOperation,transId);
+ }
+ break;
case Lob_ReadDesc: // read desc only. Needed for pass thru.
err = lobPtr->getDesc(desc,handleIn,handleInLen,(char *)blackBox, &blackBoxLen,handleOut,handleOutLen,transId);
retOperLen = 0;
@@ -2711,7 +2789,7 @@ Ex_Lob_Error ExLobsOper (
break;
case Lob_CloseCursor:
- err = lobPtr->closeCursor(handleIn, handleInLen);
+ err = lobPtr->closeCursor(handleIn, handleInLen,transId);
break;
case Lob_CloseDataCursorSimple:
http://git-wip-us.apache.org/repos/asf/trafodion/blob/f1864484/core/sql/exp/ExpLOBaccess.h
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpLOBaccess.h b/core/sql/exp/ExpLOBaccess.h
index acb63fc..3a5a8ca 100644
--- a/core/sql/exp/ExpLOBaccess.h
+++ b/core/sql/exp/ExpLOBaccess.h
@@ -436,7 +436,7 @@ class ExLob : public NABasicObject
Ex_Lob_Error purgeLob();
Ex_Lob_Error closeFile();
LobInputOutputFileType fileType(char *ioFileName);
- Ex_Lob_Error closeCursor(char *handleIn, Int32 handleInLen);
+ Ex_Lob_Error closeCursor(char *handleIn, Int32 handleInLen,Int64 transId);
Ex_Lob_Error closeDataCursorSimple(const char *fileName, ExLobGlobals *lobGlobals);
Ex_Lob_Error doSanityChecks(char *dir, LobsStorage storage,
@@ -496,7 +496,7 @@ class ExLob : public NABasicObject
ExLobStats *getStats() { return &stats_; }
NAHeap *getLobGlobalHeap() { return lobGlobalHeap_;}
-
+ Ex_Lob_Error getLength(char *handleIn, Int32 handleInLen,Int64 &outLobLen,LobsSubOper so, Int64 transId);
// ExLobRequest *getRequest() { return &request_; }
//The next 2 functions are not active at this point. They serve as an example
http://git-wip-us.apache.org/repos/asf/trafodion/blob/f1864484/core/sql/exp/ExpLOBenums.h
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpLOBenums.h b/core/sql/exp/ExpLOBenums.h
index 37af1d0..d04b080 100644
--- a/core/sql/exp/ExpLOBenums.h
+++ b/core/sql/exp/ExpLOBenums.h
@@ -259,7 +259,9 @@ typedef enum {
Lob_Cleanup, // destroy everything under globals
Lob_PerformGC,
Lob_RestoreLobDataFile,
- Lob_PurgeBackupLobDataFile
+ Lob_PurgeBackupLobDataFile,
+ Lob_GetLength
+
} LobsOper;
typedef enum {
http://git-wip-us.apache.org/repos/asf/trafodion/blob/f1864484/core/sql/exp/ExpLOBinterface.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpLOBinterface.cpp b/core/sql/exp/ExpLOBinterface.cpp
index 5016a01..9b58344 100644
--- a/core/sql/exp/ExpLOBinterface.cpp
+++ b/core/sql/exp/ExpLOBinterface.cpp
@@ -982,8 +982,9 @@ Lng32 ExpLOBInterfaceSelectCursor(void * exLobGlob,
waitedOp,
exLobGlob,
0,
- hdfsDetailError, 0,0,0,0,0,0,0,
+ hdfsDetailError,0,0,0,0,0,0,0,
openType
+
);
if (err != LOB_OPER_OK)
@@ -994,6 +995,60 @@ Lng32 ExpLOBInterfaceSelectCursor(void * exLobGlob,
return LOB_ACCESS_SUCCESS;
}
+
+Lng32 ExpLOBInterfaceGetLobLength(void * exLobGlob,
+ char * lobName,
+ char * lobLoc,
+ Lng32 lobType,
+ char * lobHdfsServer,
+ Lng32 lobHdfsPort,
+ Int32 handleLen,
+ char * lobHandle,
+ Int64 &outLobLen
+
+ )
+{
+ Ex_Lob_Error err;
+
+ Int64 dummyParam = 0;
+ Int32 dummyParam2 = 0;
+ Ex_Lob_Error status;
+ Int64 cliError=0;
+
+ LobsOper lo;
+ LobsSubOper so;
+ LobsStorage ls = (LobsStorage)lobType;
+ if (ls == Lob_External_HDFS_File)
+ so = Lob_External_File;
+ else
+ so = Lob_Buffer;
+ err = ExLobsOper(lobName,
+ lobHandle, handleLen,
+ lobHdfsServer, lobHdfsPort,
+ NULL, dummyParam2,
+ dummyParam, dummyParam,
+ outLobLen,
+ dummyParam, dummyParam,
+ status, cliError,
+ lobLoc, ls, //Lob_HDFS_File,
+ NULL, 0,
+ dummyParam,NULL,
+ Lob_GetLength,
+ so,
+ TRUE,
+ exLobGlob,
+ 0,
+ 0, 0,0,0,0,0,0,0,
+ 0
+ );
+
+ if (err != LOB_OPER_OK)
+ {
+ return -err;
+ }
+
+ return LOB_ACCESS_SUCCESS;
+}
Lng32 ExpLOBinterfaceStats(
void * exLobGlob,
ExLobStats * lobStats,
http://git-wip-us.apache.org/repos/asf/trafodion/blob/f1864484/core/sql/exp/ExpLOBinterface.h
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpLOBinterface.h b/core/sql/exp/ExpLOBinterface.h
index a8245c8..88b6fe9 100644
--- a/core/sql/exp/ExpLOBinterface.h
+++ b/core/sql/exp/ExpLOBinterface.h
@@ -331,6 +331,19 @@ Lng32 ExpLOBinterfaceEmptyDirectory(void * lobGlob,
short replication =0,
int blocksize=0);
+Lng32 ExpLOBInterfaceGetLobLength(void * exLobGlob,
+ char * lobName,
+ char * lobLoc,
+ Lng32 lobType,
+ char * lobHdfsServer,
+ Lng32 lobHdfsPort,
+ Int32 handleLen,
+ char * lobHandle,
+ Int64 &outLobLen
+
+ );
+
+
/*
class HdfsFileInfo
{
http://git-wip-us.apache.org/repos/asf/trafodion/blob/f1864484/core/sql/generator/GenRelExeUtil.cpp
----------------------------------------------------------------------
diff --git a/core/sql/generator/GenRelExeUtil.cpp b/core/sql/generator/GenRelExeUtil.cpp
index d514cb5..df627cb 100644
--- a/core/sql/generator/GenRelExeUtil.cpp
+++ b/core/sql/generator/GenRelExeUtil.cpp
@@ -4298,7 +4298,7 @@ if (handleInStringFormat_)
{
exe_util_tdb->setRetrieveLength(TRUE);
}
- exe_util_tdb->setTotalBufSize(CmpCommon::getDefaultNumeric(LOB_MAX_CHUNK_MEM_SIZE));
+ exe_util_tdb->setTotalBufSize(CmpCommon::getDefaultNumeric(LOB_MAX_CHUNK_MEM_SIZE)*1024*1024);
generator->setCriDesc(givenDesc, Generator::DOWN);
generator->setCriDesc(returnedDesc, Generator::UP);
[23/32] trafodion git commit: [TRAFODION-2861][TRAFODION-2869] Remove
incubating from release packaging
Posted by li...@apache.org.
[TRAFODION-2861][TRAFODION-2869] Remove incubating from release packaging
Remove disclaimer file and incubating string from packaging file names.
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/6429a0c2
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/6429a0c2
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/6429a0c2
Branch: refs/heads/master
Commit: 6429a0c2839dd22eefbd6ed368236492e8f730fc
Parents: 6047c51
Author: Steve Varnau <st...@esgyn.com>
Authored: Thu Jan 4 20:07:47 2018 +0000
Committer: Steve Varnau <st...@esgyn.com>
Committed: Thu Jan 11 18:22:17 2018 +0000
----------------------------------------------------------------------
DISCLAIMER | 1 -
Makefile | 14 +++++++-------
core/Makefile | 2 +-
core/conn/Makefile | 7 ++-----
core/conn/jdbcT4/pom.xml | 6 +++---
core/sqf/.gitignore | 2 --
core/sqf/Makefile | 12 +++---------
core/trafodion.spec | 2 +-
.../src/asciidoc/_chapters/preparation.adoc | 4 ++--
.../src/asciidoc/_chapters/quickstart.adoc | 2 +-
install/.gitignore | 1 -
install/Makefile | 7 ++-----
install/ambari-installer/Makefile | 6 +-----
licenses/Makefile | 5 +----
14 files changed, 24 insertions(+), 47 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/6429a0c2/DISCLAIMER
----------------------------------------------------------------------
diff --git a/DISCLAIMER b/DISCLAIMER
deleted file mode 100644
index 9fd36df..0000000
--- a/DISCLAIMER
+++ /dev/null
@@ -1 +0,0 @@
-*** File To Be Removed - still referenced in packaging ***
http://git-wip-us.apache.org/repos/asf/trafodion/blob/6429a0c2/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index c69e51e..3a67ccb 100644
--- a/Makefile
+++ b/Makefile
@@ -36,15 +36,15 @@ package-all:
@echo "Packaging all Trafodion components"
cd core && $(MAKE) package-all
-package-src: $(SRCDIR)-${TRAFODION_VER}-incubating/LICENSE
+package-src: $(SRCDIR)-${TRAFODION_VER}/LICENSE
@echo "Packaging source for $(TRAFODION_VER_PROD) $(TRAFODION_VER)"
mkdir -p distribution
- git archive --format tar --prefix $(SRCDIR)-${TRAFODION_VER}-incubating/ HEAD > distribution/$(SRCDIR)-${TRAFODION_VER}-incubating-src.tar
- tar rf distribution/$(SRCDIR)-${TRAFODION_VER}-incubating-src.tar $^
- gzip distribution/$(SRCDIR)-${TRAFODION_VER}-incubating-src.tar
- rm -rf $(SRCDIR)-${TRAFODION_VER}-incubating LICENSE
+ git archive --format tar --prefix $(SRCDIR)-${TRAFODION_VER}/ HEAD > distribution/$(SRCDIR)-${TRAFODION_VER}-src.tar
+ tar rf distribution/$(SRCDIR)-${TRAFODION_VER}-src.tar $^
+ gzip distribution/$(SRCDIR)-${TRAFODION_VER}-src.tar
+ rm -rf $(SRCDIR)-${TRAFODION_VER} LICENSE
-$(SRCDIR)-${TRAFODION_VER}-incubating/LICENSE:
+$(SRCDIR)-${TRAFODION_VER}/LICENSE:
cd licenses && $(MAKE) LICENSE-src
mkdir -p $(@D)
cp licenses/LICENSE-src $@
@@ -57,7 +57,7 @@ clean:
@echo "Removing Trafodion objects"
cd core && $(MAKE) clean
cd licenses && $(MAKE) clean
- rm -rf $(SRCDIR)-${TRAFODION_VER}-incubating LICENSE
+ rm -rf $(SRCDIR)-${TRAFODION_VER} LICENSE
cleanall:
@echo "Removing all Trafodion objects"
http://git-wip-us.apache.org/repos/asf/trafodion/blob/6429a0c2/core/Makefile
----------------------------------------------------------------------
diff --git a/core/Makefile b/core/Makefile
index 19236dd..bbd0878 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -178,7 +178,7 @@ P_TYPE = $(shell uname -p)
ifeq ($(SQ_BUILD_TYPE),release)
RELEASE ?= 1
- SERVERTAR="$(PKG_PROD)_server-$(TRAFODION_VER)-${OS_TYPE}${OS_MAJOR}-${P_TYPE}-incubating.tar.gz"
+ SERVERTAR="$(PKG_PROD)_server-$(TRAFODION_VER)-${OS_TYPE}${OS_MAJOR}-${P_TYPE}.tar.gz"
else
RELEASE ?= devel
SERVERTAR="$(PKG_PROD)_server-$(TRAFODION_VER)-${OS_TYPE}${OS_MAJOR}-${P_TYPE}-debug.tar.gz"
http://git-wip-us.apache.org/repos/asf/trafodion/blob/6429a0c2/core/conn/Makefile
----------------------------------------------------------------------
diff --git a/core/conn/Makefile b/core/conn/Makefile
index 5197837..f853896 100644
--- a/core/conn/Makefile
+++ b/core/conn/Makefile
@@ -30,7 +30,7 @@ OS_MAJOR ?= $(shell lsb_release -rs | cut -f1 -d.)
P_TYPE = $(shell uname -p)
ifeq ($(SQ_BUILD_TYPE),release)
- CLIENT_TAR ?= ../../${DISTRIBUTION_DIR}/apache-trafodion_clients-$(TRAFODION_VER)-${OS_TYPE}${OS_MAJOR}-${P_TYPE}-incubating.tar.gz
+ CLIENT_TAR ?= ../../${DISTRIBUTION_DIR}/apache-trafodion_clients-$(TRAFODION_VER)-${OS_TYPE}${OS_MAJOR}-${P_TYPE}.tar.gz
else
CLIENT_TAR ?= ../../${DISTRIBUTION_DIR}/apache-trafodion_clients-$(TRAFODION_VER)-${OS_TYPE}${OS_MAJOR}-${P_TYPE}-debug.tar.gz
endif
@@ -39,7 +39,7 @@ endif
.PHONY: all
all: pkg-clients
-pkg-clients: clients/LICENSE clients/NOTICE clients/DISCLAIMER
+pkg-clients: clients/LICENSE clients/NOTICE
mkdir -p $$(dirname $(CLIENT_TAR))
tar -zcvf $(CLIENT_TAR) clients
@@ -52,9 +52,6 @@ clients/LICENSE: ../../licenses/LICENSE-clients
clients/NOTICE: ../../NOTICE
cp -f $? $@
-clients/DISCLAIMER: ../../DISCLAIMER
- cp -f $? $@
-
clean:
$(RM) -rf $(TRAF_HOME)/../conn/clients
$(RM) -f $(TRAF_HOME)/../conn/*.mf
http://git-wip-us.apache.org/repos/asf/trafodion/blob/6429a0c2/core/conn/jdbcT4/pom.xml
----------------------------------------------------------------------
diff --git a/core/conn/jdbcT4/pom.xml b/core/conn/jdbcT4/pom.xml
index 8f83ecf..1750c42 100644
--- a/core/conn/jdbcT4/pom.xml
+++ b/core/conn/jdbcT4/pom.xml
@@ -51,9 +51,9 @@
</distributionManagement>
<scm>
- <connection>scm:git:https://github.com/apache/incubator-trafodion.git</connection>
- <developerConnection>scm:git:https://github.com/apache/incubator-trafodion.git</developerConnection>
- <url>https://github.com/apache/incubator-trafodion.git</url>
+ <connection>scm:git:https://github.com/apache/trafodion.git</connection>
+ <developerConnection>scm:git:https://github.com/apache/trafodion.git</developerConnection>
+ <url>https://github.com/apache/trafodion.git</url>
<tag>HEAD</tag>
</scm>
http://git-wip-us.apache.org/repos/asf/trafodion/blob/6429a0c2/core/sqf/.gitignore
----------------------------------------------------------------------
diff --git a/core/sqf/.gitignore b/core/sqf/.gitignore
index 380ea87..a8425d5 100644
--- a/core/sqf/.gitignore
+++ b/core/sqf/.gitignore
@@ -68,8 +68,6 @@ Linux-x86_64/
# derived license
/LICENSE
/NOTICE
-/DISCLAIMER
-sqf/DISCLAIMER
# bundled component links
/dcs-*
http://git-wip-us.apache.org/repos/asf/trafodion/blob/6429a0c2/core/sqf/Makefile
----------------------------------------------------------------------
diff --git a/core/sqf/Makefile b/core/sqf/Makefile
index 6f4844b..2c1d952 100644
--- a/core/sqf/Makefile
+++ b/core/sqf/Makefile
@@ -268,7 +268,7 @@ OS_MAJOR ?= $(shell lsb_release -rs | cut -f1 -d.)
P_TYPE = $(shell uname -p)
ifeq ($(SQ_BUILD_TYPE),release)
- PKG_TYPE="server-$(TRAFODION_VER)-${OS_TYPE}${OS_MAJOR}-${P_TYPE}-incubating"
+ PKG_TYPE="server-$(TRAFODION_VER)-${OS_TYPE}${OS_MAJOR}-${P_TYPE}"
else
PKG_TYPE="server-$(TRAFODION_VER)-${OS_TYPE}${OS_MAJOR}-${P_TYPE}-debug"
endif
@@ -287,7 +287,7 @@ PKG_BIN_OBJS += sysinstall
PKG_BIN_OBJS += trafci
PKG_BIN_OBJS += samples
PKG_BIN_OBJS += export/limited-support-tools
-PKG_BIN_OBJS += LICENSE NOTICE DISCLAIMER
+PKG_BIN_OBJS += LICENSE NOTICE
PKG_BIN_OBJS += rest-${TRAFODION_VER} dcs-${TRAFODION_VER}
PKG_BIN_DIRS ?= sql export
@@ -328,12 +328,6 @@ NOTICE: ../../licenses/NOTICE-server
../../licenses/NOTICE-server:
cd $(@D) && $(MAKE) $(@F)
-DISCLAIMER: ../../licenses/DISCLAIMER-server
- cp -f $? $@
-
-../../licenses/DISCLAIMER-server:
- cd $(@D) && $(MAKE) $(@F)
-
rest-${TRAFODION_VER}:
ln -s ../rest/target/$@/$@ $@
@@ -352,7 +346,7 @@ pkglist-files: pkglist-symlinks
find -L $(PKG_BIN_OBJS) -type d -o -type f | grep -v -xf pkglist-symlinks > $@
# simple symlinks that point to filename (does not start with . or /)
-pkglist-symlinks: LICENSE NOTICE DISCLAIMER rest-${TRAFODION_VER} dcs-${TRAFODION_VER}
+pkglist-symlinks: LICENSE NOTICE rest-${TRAFODION_VER} dcs-${TRAFODION_VER}
find $(PKG_BIN_OBJS) -lname '[^./]*' > $@
# Targets to tar/gzip the self installer
http://git-wip-us.apache.org/repos/asf/trafodion/blob/6429a0c2/core/trafodion.spec
----------------------------------------------------------------------
diff --git a/core/trafodion.spec b/core/trafodion.spec
index 34ceed2..a8db7fa 100644
--- a/core/trafodion.spec
+++ b/core/trafodion.spec
@@ -29,7 +29,7 @@ Group: Applications/Databases
Source0: %{name}-%{version}.tar.gz
BuildArch: %{_arch}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
-URL: http://trafodion.incubator.apache.org
+URL: http://trafodion.apache.org
%define _binary_filedigest_algorithm 1
http://git-wip-us.apache.org/repos/asf/trafodion/blob/6429a0c2/docs/client_install/src/asciidoc/_chapters/preparation.adoc
----------------------------------------------------------------------
diff --git a/docs/client_install/src/asciidoc/_chapters/preparation.adoc b/docs/client_install/src/asciidoc/_chapters/preparation.adoc
index d042017..9b635b3 100644
--- a/docs/client_install/src/asciidoc/_chapters/preparation.adoc
+++ b/docs/client_install/src/asciidoc/_chapters/preparation.adoc
@@ -136,7 +136,7 @@ an `apache-trafodion-clients-*.tar` file.
. Verify content of the `clients` directory:
+
```
-DISCLAIMER JDBCT4.zip LICENSE NOTICE odb64_linux.tar.gz trafci.zip TRAF_ODBC_Linux_Driver_64.tar.gz
+JDBCT4.zip LICENSE NOTICE odb64_linux.tar.gz trafci.zip TRAF_ODBC_Linux_Driver_64.tar.gz
```
+
You use these files to install the different {project-name} clients.
@@ -168,7 +168,7 @@ $ wget <link to package>
$ tar -xzvf apache-trafodion_clients-*.tar.gz
$ cd clients
$ ls
-DISCLAIMER LICENSE odb64_linux.tar.gz TRAF_ODBC_Linux_Driver_64.tar.gz
+LICENSE odb64_linux.tar.gz TRAF_ODBC_Linux_Driver_64.tar.gz
JDBCT4.zip NOTICE trafci.zip
$
```
http://git-wip-us.apache.org/repos/asf/trafodion/blob/6429a0c2/docs/provisioning_guide/src/asciidoc/_chapters/quickstart.adoc
----------------------------------------------------------------------
diff --git a/docs/provisioning_guide/src/asciidoc/_chapters/quickstart.adoc b/docs/provisioning_guide/src/asciidoc/_chapters/quickstart.adoc
index c346ee3..e457d72 100644
--- a/docs/provisioning_guide/src/asciidoc/_chapters/quickstart.adoc
+++ b/docs/provisioning_guide/src/asciidoc/_chapters/quickstart.adoc
@@ -95,7 +95,7 @@ $ cd $HOME/trafodion-downloads
$ tar -zxf apache-trafodion-pyinstaller-2.2.0.tar.gz -C $HOME/trafodion-installer
$ cp -f apache-trafodion_server-2.2.0-RH-x86_64.tar.gz $HOME/trafodion-installer
$ ls $HOME/trafodion-installer/python-installer
-apache-trafodion_server-2.2.0-RH-x86_64.tar.gz db_install.py DISCLAIMER LICENSE prettytable.py scripts
+apache-trafodion_server-2.2.0-RH-x86_64.tar.gz db_install.py LICENSE prettytable.py scripts
configs db_uninstall.py discovery.py NOTICE README.md
$
```
http://git-wip-us.apache.org/repos/asf/trafodion/blob/6429a0c2/install/.gitignore
----------------------------------------------------------------------
diff --git a/install/.gitignore b/install/.gitignore
index 2aa6b05..aafac2b 100644
--- a/install/.gitignore
+++ b/install/.gitignore
@@ -1,7 +1,6 @@
installer-*.tar.gz
LICENSE
NOTICE
-DISCLAIMER
ambari-installer/RPMROOT
ambari-installer/traf-mpack.tar.gz
ambari-installer/mpack-install/repo
http://git-wip-us.apache.org/repos/asf/trafodion/blob/6429a0c2/install/Makefile
----------------------------------------------------------------------
diff --git a/install/Makefile b/install/Makefile
index c131f58..13bc734 100644
--- a/install/Makefile
+++ b/install/Makefile
@@ -14,7 +14,7 @@
# limitations under the License.
#
# @@@ END COPYRIGHT @@@
-RELEASE_VER ?= ${TRAFODION_VER}-incubating
+RELEASE_VER ?= ${TRAFODION_VER}
RELEASE_TYPE ?= $(shell echo $(TRAFODION_VER_PROD)| sed -e 's/ /-/g')
PYINSTALLER_TARNAME = $(shell echo ${RELEASE_TYPE}_pyinstaller-${RELEASE_VER}.tar.gz |tr '[A-Z]' '[a-z]')
@@ -26,7 +26,7 @@ pkg-ambari:
create-dir:
mkdir -p ../distribution
-pkg-pyinstaller: create-dir python-installer/LICENSE python-installer/NOTICE python-installer/DISCLAIMER
+pkg-pyinstaller: create-dir python-installer/LICENSE python-installer/NOTICE
tar czf ${PYINSTALLER_TARNAME} python-installer
mv ${PYINSTALLER_TARNAME} ../distribution
@@ -39,9 +39,6 @@ python-installer/LICENSE: ../licenses/LICENSE-pyinstall
python-installer/NOTICE: ../NOTICE
cp -f $? $@
-python-installer/DISCLAIMER: ../DISCLAIMER
- cp -f $? $@
-
version:
@echo "$(RELEASE_VER)"
http://git-wip-us.apache.org/repos/asf/trafodion/blob/6429a0c2/install/ambari-installer/Makefile
----------------------------------------------------------------------
diff --git a/install/ambari-installer/Makefile b/install/ambari-installer/Makefile
index 0c6e7c6..02819af 100644
--- a/install/ambari-installer/Makefile
+++ b/install/ambari-installer/Makefile
@@ -36,7 +36,7 @@ all: rpmbuild
# select trafodion version for given HDP stack
REPO_LIST= 2.1.0 $(TRAFODION_VER)
-$(SOURCEDIR)/ambari_rpm.tar.gz: mpack-install/LICENSE mpack-install/NOTICE mpack-install/DISCLAIMER repofiles traf-mpack/mpack.json
+$(SOURCEDIR)/ambari_rpm.tar.gz: mpack-install/LICENSE mpack-install/NOTICE repofiles traf-mpack/mpack.json
rm -rf $(RPMROOT)
mkdir -p $(SOURCEDIR)
tar czf $@ traf-mpack mpack-install
@@ -65,9 +65,6 @@ mpack-install/LICENSE: ../../licenses/LICENSE-install
mpack-install/NOTICE: ../../NOTICE
cp -f $? $@
-mpack-install/DISCLAIMER: ../../DISCLAIMER
- cp -f $? $@
-
rpmbuild: $(SOURCEDIR)/ambari_rpm.tar.gz
mkdir -p $(RPMDIR)
mkdir -p $(BUILDDIR)
@@ -89,7 +86,6 @@ clean:
rm -rf $(RPMROOT)
rm -rf mpack-install/LICENSE
rm -rf mpack-install/NOTICE
- rm -rf mpack-install/DISCLAIMER
rm -rf traf-mpack/custom-services/TRAFODION/*/repos
rm -f traf-mpack/custom-services/TRAFODION/*/metainfo.xml
rm -rf traf-mpack/mpack.json
http://git-wip-us.apache.org/repos/asf/trafodion/blob/6429a0c2/licenses/Makefile
----------------------------------------------------------------------
diff --git a/licenses/Makefile b/licenses/Makefile
index cc194b7..9004179 100644
--- a/licenses/Makefile
+++ b/licenses/Makefile
@@ -19,7 +19,7 @@
#
# @@@ END COPYRIGHT @@@
-all: LICENSE-src LICENSE-server LICENSE-pyinstall LICENSE-install LICENSE-clients NOTICE-server DISCLAIMER-server
+all: LICENSE-src LICENSE-server LICENSE-pyinstall LICENSE-install LICENSE-clients NOTICE-server
# All source code included in Trafodion source
LICENSE-src:
@@ -33,9 +33,6 @@ LICENSE-server:
NOTICE-server:
cat ../NOTICE note-server-bin > $@
-DISCLAIMER-server:
- cat ../DISCLAIMER > $@
-
LICENSE-install:
cat Apache > $@
[27/32] trafodion git commit: [Trafodion 2942] Update year in license
text
Posted by li...@apache.org.
[Trafodion 2942] Update year in license text
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/0d68dfe4
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/0d68dfe4
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/0d68dfe4
Branch: refs/heads/master
Commit: 0d68dfe4ecd26d40d4b96345d42329d6e57ef83e
Parents: 5be0d2e 69ae1b1
Author: Liu Ming <ov...@sina.com>
Authored: Fri Feb 2 10:52:36 2018 +0000
Committer: Liu Ming <ov...@sina.com>
Committed: Fri Feb 2 10:52:36 2018 +0000
----------------------------------------------------------------------
NOTICE | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[26/32] trafodion git commit: [TRAFODION-2942] license year should be
updated
Posted by li...@apache.org.
[TRAFODION-2942] license year should be updated
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/69ae1b14
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/69ae1b14
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/69ae1b14
Branch: refs/heads/master
Commit: 69ae1b14ac19d057a2bdc98a061154a254c5c7cd
Parents: 5be0d2e
Author: Liu Ming <ov...@sina.com>
Authored: Thu Feb 1 07:22:13 2018 +0000
Committer: Liu Ming <ov...@sina.com>
Committed: Thu Feb 1 07:22:13 2018 +0000
----------------------------------------------------------------------
NOTICE | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/69ae1b14/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index edd4485..6e2fb4d 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
Apache Trafodion
-Copyright 2015-2017 The Apache Software Foundation
+Copyright 2015-2018 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
[32/32] trafodion git commit: merge [TRAFODION-3014]
Posted by li...@apache.org.
merge [TRAFODION-3014]
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/92476567
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/92476567
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/92476567
Branch: refs/heads/master
Commit: 92476567fa3246236bd2847333b53f84cfbd1f56
Parents: 3dd0eca c75c6bf
Author: Liu Ming <ov...@sina.com>
Authored: Fri Apr 13 07:24:32 2018 +0000
Committer: Liu Ming <ov...@sina.com>
Committed: Fri Apr 13 07:24:32 2018 +0000
----------------------------------------------------------------------
NOTICE | 2 +-
.../trafodion/jdbc/t4/ExtractLobMessage.java | 13 +--
.../org/trafodion/jdbc/t4/ExtractLobReply.java | 23 +++--
.../org/trafodion/jdbc/t4/T4Properties.java | 48 +++++++++-
.../java/org/trafodion/jdbc/t4/TrafT4Blob.java | 11 ---
.../java/org/trafodion/jdbc/t4/TrafT4Clob.java | 13 ---
.../java/org/trafodion/jdbc/t4/TrafT4Lob.java | 39 ++++++--
.../org/trafodion/jdbc/t4/TrafT4ResultSet.java | 8 +-
.../nsksrvr/Interface/marshalingsrvr_srvr.cpp | 48 +++++++---
.../nsksrvr/Interface/marshalingsrvr_srvr.h | 6 +-
.../src/odbc/nsksrvr/Interface/odbcs_srvr.cpp | 11 ++-
.../odbc/nsksrvr/Interface/odbcs_srvr_res.cpp | 18 ++--
.../src/odbc/nsksrvr/Interface/odbcs_srvr_res.h | 6 +-
core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.cpp | 20 +++--
core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.h | 3 +-
.../conn/odbc/src/odbc/nsksrvrcore/srvrcommon.h | 5 +-
.../odbc/src/odbc/nsksrvrcore/srvrothers.cpp | 94 +++++++-------------
.../java/org/trafodion/ci/SessionInterface.java | 2 +
core/sql/executor/ExExeUtilLoad.cpp | 1 -
core/sql/exp/ExpLOBaccess.cpp | 1 +
core/sql/exp/ExpLOBinterface.cpp | 2 -
.../org/trafodion/jdbc_test/JdbcCommon.java | 27 ++++--
.../java/org/trafodion/jdbc_test/PropTest.java | 9 +-
.../java/org/trafodion/jdbc_test/TestBlob.java | 16 ++--
.../org/trafodion/jdbc_test/TestBlobBatch.java | 12 ++-
.../java/org/trafodion/jdbc_test/TestClob.java | 17 +++-
.../org/trafodion/jdbc_test/TestClobBatch.java | 15 ++--
.../org/trafodion/jdbc_test/TestForeignKey.java | 87 +++++++++++-------
.../trafodion/jdbc_test/TestGetIndexInfo.java | 24 +++--
install/python-installer/scripts/hdfs_cmds.py | 2 +-
30 files changed, 364 insertions(+), 219 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/92476567/core/sql/executor/ExExeUtilLoad.cpp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/92476567/core/sql/exp/ExpLOBaccess.cpp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/92476567/core/sql/exp/ExpLOBinterface.cpp
----------------------------------------------------------------------
[13/32] trafodion git commit: [TRAFODION-2704]close unused statment
in JDBC regression
Posted by li...@apache.org.
[TRAFODION-2704]close unused statment in JDBC regression
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/808c8745
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/808c8745
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/808c8745
Branch: refs/heads/master
Commit: 808c87450f343e6df3dcc82e0799919581958513
Parents: 42b2b0b
Author: Weiqing Xu <we...@esgyn.cn>
Authored: Wed Sep 20 05:49:28 2017 +0000
Committer: Weiqing Xu <we...@esgyn.cn>
Committed: Wed Sep 20 05:49:28 2017 +0000
----------------------------------------------------------------------
.../org/trafodion/jdbc_test/JdbcCommon.java | 27 ++++++---
.../org/trafodion/jdbc_test/TestForeignKey.java | 62 +++++++++++++-------
2 files changed, 59 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/808c8745/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/JdbcCommon.java
----------------------------------------------------------------------
diff --git a/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/JdbcCommon.java b/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/JdbcCommon.java
index 6ab5fca..ec68443 100644
--- a/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/JdbcCommon.java
+++ b/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/JdbcCommon.java
@@ -117,8 +117,11 @@ public class JdbcCommon {
StringBuilder buf = new StringBuilder(ddl);
ddl = buf.toString();
- try {
- _conn.createStatement().execute(ddl);
+ try (
+ Statement stmt = _conn.createStatement();
+ )
+ {
+ stmt.execute(ddl);
} catch (Exception e) {
System.out.println(e.getMessage());
fail("Failed to create table");
@@ -154,8 +157,11 @@ public class JdbcCommon {
if (commConn == null)
commConn = getConnection();
- try {
- commConn.createStatement().execute("create schema " + _catalog + "." + _schema);
+ try (
+ Statement stmt = commConn.createStatement();
+ )
+ {
+ stmt.execute("create schema " + _catalog + "." + _schema);
} catch (Exception e) {
// Do nothing, the schema may already exist.
}
@@ -165,8 +171,11 @@ public class JdbcCommon {
if (commConn == null)
commConn = getConnection();
- try {
- commConn.createStatement().execute("drop schema " + _catalog + "." + _schema + " cascade");
+ try (
+ Statement stmt = commConn.createStatement();
+ )
+ {
+ stmt.execute("drop schema " + _catalog + "." + _schema + " cascade");
} catch (Exception e) {
// Do nothing, the schema may not exist.
}
@@ -184,8 +193,10 @@ public class JdbcCommon {
for (String objname : objDropList) {
for (int i = 0; i < 3; i++) {
- try {
- commConn.createStatement().executeUpdate("drop " + objname + " cascade");
+ try (
+ Statement stmt = commConn.createStatement();
+ ){
+ stmt.executeUpdate("drop " + objname + " cascade");
break; // no execption, break out here
} catch (Exception e) {
String msg = e.getMessage();
http://git-wip-us.apache.org/repos/asf/trafodion/blob/808c8745/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestForeignKey.java
----------------------------------------------------------------------
diff --git a/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestForeignKey.java b/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestForeignKey.java
index d6c2175..9c87e9e 100644
--- a/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestForeignKey.java
+++ b/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestForeignKey.java
@@ -74,12 +74,15 @@ public class TestForeignKey {
public static void doTestSuiteSetup() throws Exception {
try{
_conn = DriverManager.getConnection(Utils.url, Utils.usr, Utils.pwd);
- Statement stmt = _conn.createStatement();
-
- stmt.execute(strCreatePKTABLE1Query);
- stmt.execute(strCreatePKTABLE2Query);
- stmt.execute(strCreateFKTABLE1Query);
- stmt.execute(strCreateFKTABLE2Query);
+ try (
+ Statement stmt = _conn.createStatement();
+ )
+ {
+ stmt.execute(strCreatePKTABLE1Query);
+ stmt.execute(strCreatePKTABLE2Query);
+ stmt.execute(strCreateFKTABLE1Query);
+ stmt.execute(strCreateFKTABLE2Query);
+ }
}
catch (Exception e) {
System.out.println(e.getMessage());
@@ -96,12 +99,19 @@ public class TestForeignKey {
try {
DatabaseMetaData metaData = _conn.getMetaData();
- ResultSet rs = metaData.getImportedKeys("TRAFODION", Utils.schema, FKTABLE1);
int rowNum = 0;
- while(rs.next()) {
- compareForeignkeyWithExp("testGetImportedKeys", rowNum + 1, rs, expFkInfo[rowNum]);
- rowNum += 1;
- }
+ try (
+ ResultSet rs = metaData.getImportedKeys("TRAFODION", Utils.schema, FKTABLE1);
+ )
+ {
+ while(rs.next()) {
+ compareForeignkeyWithExp("testGetImportedKeys", rowNum + 1, rs, expFkInfo[rowNum]);
+ rowNum += 1;
+ }
+ }
+ catch (Exception e) {
+ fail(e.getMessage());
+ }
assertEquals(rowNum, 2);
} catch (Exception e) {
e.printStackTrace();
@@ -117,12 +127,16 @@ public class TestForeignKey {
try {
DatabaseMetaData metaData = _conn.getMetaData();
- ResultSet rs = metaData.getExportedKeys("TRAFODION", Utils.schema, PKTABLE1);
- int rowNum = 0;
- while(rs.next()) {
- compareForeignkeyWithExp("testGetExportedKeys", rowNum + 1, rs, expFkInfo[rowNum]);
- rowNum += 1;
- }
+ int rowNum = 0;
+ try (
+ ResultSet rs = metaData.getExportedKeys("TRAFODION", Utils.schema, PKTABLE1);
+ )
+ {
+ while(rs.next()) {
+ compareForeignkeyWithExp("testGetExportedKeys", rowNum + 1, rs, expFkInfo[rowNum]);
+ rowNum += 1;
+ }
+ }
assertEquals(rowNum, 2);
} catch (Exception e) {
e.printStackTrace();
@@ -137,12 +151,16 @@ public class TestForeignKey {
try {
DatabaseMetaData metaData = _conn.getMetaData();
- ResultSet rs = metaData.getCrossReference("TRAFODION", Utils.schema, PKTABLE1, "TRAFODION", Utils.schema, FKTABLE1);
int rowNum = 0;
- while(rs.next()) {
- compareForeignkeyWithExp("testGetCrossReference", rowNum + 1, rs, expFkInfo[rowNum]);
- rowNum += 1;
- }
+ try (
+ ResultSet rs = metaData.getCrossReference("TRAFODION", Utils.schema, PKTABLE1, "TRAFODION", Utils.schema, FKTABLE1);
+ )
+ {
+ while(rs.next()) {
+ compareForeignkeyWithExp("testGetCrossReference", rowNum + 1, rs, expFkInfo[rowNum]);
+ rowNum += 1;
+ }
+ }
assertEquals(rowNum, 1);
} catch (Exception e) {
e.printStackTrace();
[19/32] trafodion git commit: [TRAFODION-2753]LOB: filetolob() no
longer works in trafci
Posted by li...@apache.org.
[TRAFODION-2753]LOB: filetolob() no longer works in trafci
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/de664c37
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/de664c37
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/de664c37
Branch: refs/heads/master
Commit: de664c37a95f89573ccc4466357d5ebf94df22a5
Parents: 1ade420
Author: Weiqing Xu <we...@esgyn.cn>
Authored: Mon Sep 25 05:47:56 2017 +0000
Committer: Weiqing Xu <we...@esgyn.cn>
Committed: Mon Sep 25 05:47:56 2017 +0000
----------------------------------------------------------------------
.../org/trafodion/jdbc/t4/T4Properties.java | 20 ++++++++++++++++++++
.../org/trafodion/jdbc/t4/TrafT4ResultSet.java | 8 ++++----
.../java/org/trafodion/ci/SessionInterface.java | 2 ++
3 files changed, 26 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/de664c37/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/T4Properties.java
----------------------------------------------------------------------
diff --git a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/T4Properties.java b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/T4Properties.java
index 202bc27..3e87910 100644
--- a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/T4Properties.java
+++ b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/T4Properties.java
@@ -120,6 +120,7 @@ public class T4Properties {
String blobTableName_;
private int lobChunkSize_ = 10; // default 10M
+ private boolean useLobHandle_ = false;
// private short transportBufferSize_;
private boolean useArrayBinding_;
@@ -429,6 +430,7 @@ public class T4Properties {
setTcpNoDelay(getProperty("tcpNoDelay"));
setLobChunkSize(getProperty("lobChunkSize"));
+ setUseLobHandle(getProperty("useLobHandle"));
}
T4Properties getT4Properties() {
@@ -523,6 +525,7 @@ public class T4Properties {
props.setProperty("tcpNoDelay", String.valueOf(_tcpNoDelay));
props.setProperty("lobChunkSize", String.valueOf(lobChunkSize_));
+ props.setProperty("useLobHandle", String.valueOf(useLobHandle_));
return props;
}
@@ -1910,6 +1913,23 @@ public class T4Properties {
}
}
+ public boolean getUseLobHandle() {
+ return useLobHandle_;
+ }
+
+ public void setUseLobHandle(boolean useLobHandle) {
+ this.useLobHandle_ = useLobHandle;
+ }
+
+ public void setUseLobHandle(String val) {
+ if (val != null) {
+ setUseLobHandle(Boolean.parseBoolean(val));
+ }
+ else {
+ setUseLobHandle(false);
+ }
+ }
+
/**
* Returns the rounding mode set for the driver as an Integer value with one
* of the following values. static int ROUND_CEILING Rounding mode to round
http://git-wip-us.apache.org/repos/asf/trafodion/blob/de664c37/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4ResultSet.java
----------------------------------------------------------------------
diff --git a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4ResultSet.java b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4ResultSet.java
index 20338a8..9997f98 100644
--- a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4ResultSet.java
+++ b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4ResultSet.java
@@ -1857,16 +1857,16 @@ public class TrafT4ResultSet extends TrafT4Handle implements java.sql.ResultSet
break;
case Types.BLOB:
data = getLocalString(columnIndex);
- if (data != null) {
+ if ( !connection_.props_.getUseLobHandle() && data != null) {
Blob blob = new TrafT4Blob(connection_, data, null);
- return new String((blob.getBytes(1, (int) blob.length())));
+ data = new String((blob.getBytes(1, (int) blob.length())));
}
break;
case Types.CLOB:
data = getLocalString(columnIndex);
- if (data != null) {
+ if ( !connection_.props_.getUseLobHandle() && data != null) {
Clob clob = new TrafT4Clob(connection_, data, null);
- return clob.getSubString(1, (int)clob.length());
+ data = clob.getSubString(1, (int)clob.length());
}
break;
case Types.VARBINARY:
http://git-wip-us.apache.org/repos/asf/trafodion/blob/de664c37/core/conn/trafci/src/main/java/org/trafodion/ci/SessionInterface.java
----------------------------------------------------------------------
diff --git a/core/conn/trafci/src/main/java/org/trafodion/ci/SessionInterface.java b/core/conn/trafci/src/main/java/org/trafodion/ci/SessionInterface.java
index 0243eb1..cf167b5 100644
--- a/core/conn/trafci/src/main/java/org/trafodion/ci/SessionInterface.java
+++ b/core/conn/trafci/src/main/java/org/trafodion/ci/SessionInterface.java
@@ -1133,6 +1133,7 @@ public class SessionInterface implements SessionDefaults
driver.getMajorVersion();
driver.getMinorVersion();
+ connProp.put("useLobHandle", String.valueOf(true));
connProp.put("user",sessObj.getSessionUser());
connProp.put("password",sessObj.getSessionPass());
@@ -1238,6 +1239,7 @@ public class SessionInterface implements SessionDefaults
driver.getMajorVersion();
driver.getMinorVersion();
+ connProp.put("useLobHandle", String.valueOf(true));
connProp.put("user", (user==null?sessObj.getSessionUser():user) );
connProp.put("password",(password==null?sessObj.getSessionPass():password));
connProp.put("roleName", (null==role?"":role));
[06/32] trafodion git commit: Expected file change to show result of
unload.
Posted by li...@apache.org.
Expected file change to show result of unload.
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/8a260f42
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/8a260f42
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/8a260f42
Branch: refs/heads/master
Commit: 8a260f425e0527100c8039b8db8a8b4db64b1101
Parents: 89576f3
Author: Sandhya Sundaresan <sa...@apache.org>
Authored: Tue Aug 22 17:41:39 2017 +0000
Committer: Sandhya Sundaresan <sa...@apache.org>
Committed: Tue Aug 22 17:41:39 2017 +0000
----------------------------------------------------------------------
core/sql/regress/hive/EXPECTED018 | 585 +++++++++++++++++----------------
1 file changed, 293 insertions(+), 292 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/8a260f42/core/sql/regress/hive/EXPECTED018
----------------------------------------------------------------------
diff --git a/core/sql/regress/hive/EXPECTED018 b/core/sql/regress/hive/EXPECTED018
index 01eb789..c9d2a4e 100644
--- a/core/sql/regress/hive/EXPECTED018
+++ b/core/sql/regress/hive/EXPECTED018
@@ -146,18 +146,18 @@
>>load with no recovery into customer_address
+>select * from hive.hive.customer_address;
Task: LOAD Status: Started Object: TRAFODION.HBASE.CUSTOMER_ADDRESS
-Task: CLEANUP Status: Started Time: 2017-05-01 18:46:29.746
-Task: CLEANUP Status: Ended Time: 2017-05-01 18:46:29.768
-Task: CLEANUP Status: Ended Elapsed Time: 00:00:00.022
-Task: LOADING DATA Status: Started Time: 2017-05-01 18:46:29.768
+Task: CLEANUP Status: Started Time: 2017-08-15 14:53:40.511
+Task: CLEANUP Status: Ended Time: 2017-08-15 14:53:40.528
+Task: CLEANUP Status: Ended Elapsed Time: 00:00:00.018
+Task: LOADING DATA Status: Started Time: 2017-08-15 14:53:40.529
Rows Processed: 50000
Error Rows: 0
-Task: LOADING DATA Status: Ended Time: 2017-05-01 18:46:39.501
-Task: LOADING DATA Status: Ended Elapsed Time: 00:00:09.236
-Task: COMPLETION Status: Started Time: 2017-05-01 18:46:39.509
+Task: LOADING DATA Status: Ended Time: 2017-08-15 14:53:50.229
+Task: LOADING DATA Status: Ended Elapsed Time: 00:00:09.701
+Task: COMPLETION Status: Started Time: 2017-08-15 14:53:50.229
Rows Loaded: 50000
-Task: COMPLETION Status: Ended Time: 2017-05-01 18:46:39.346
-Task: COMPLETION Status: Ended Elapsed Time: 00:00:00.341
+Task: COMPLETION Status: Ended Time: 2017-08-15 14:53:50.635
+Task: COMPLETION Status: Ended Elapsed Time: 00:00:00.406
--- 50000 row(s) loaded.
>>--
@@ -182,18 +182,18 @@ Task: COMPLETION Status: Ended Elapsed Time: 00:00:00.341
>>load with no recovery into customer_demographics
+>select * from hive.hive.customer_demographics where cd_demo_sk <= 20000;
Task: LOAD Status: Started Object: TRAFODION.HBASE.CUSTOMER_DEMOGRAPHICS
-Task: CLEANUP Status: Started Time: 2017-05-01 18:46:42.390
-Task: CLEANUP Status: Ended Time: 2017-05-01 18:46:42.404
-Task: CLEANUP Status: Ended Elapsed Time: 00:00:00.014
-Task: LOADING DATA Status: Started Time: 2017-05-01 18:46:42.404
+Task: CLEANUP Status: Started Time: 2017-08-15 14:53:54.217
+Task: CLEANUP Status: Ended Time: 2017-08-15 14:53:54.237
+Task: CLEANUP Status: Ended Elapsed Time: 00:00:00.020
+Task: LOADING DATA Status: Started Time: 2017-08-15 14:53:54.237
Rows Processed: 20000
Error Rows: 0
-Task: LOADING DATA Status: Ended Time: 2017-05-01 18:46:55.199
-Task: LOADING DATA Status: Ended Elapsed Time: 00:00:12.795
-Task: COMPLETION Status: Started Time: 2017-05-01 18:46:55.199
+Task: LOADING DATA Status: Ended Time: 2017-08-15 14:54:07.423
+Task: LOADING DATA Status: Ended Elapsed Time: 00:00:13.186
+Task: COMPLETION Status: Started Time: 2017-08-15 14:54:07.423
Rows Loaded: 20000
-Task: COMPLETION Status: Ended Time: 2017-05-01 18:46:55.606
-Task: COMPLETION Status: Ended Elapsed Time: 00:00:00.407
+Task: COMPLETION Status: Ended Time: 2017-08-15 14:54:07.866
+Task: COMPLETION Status: Ended Elapsed Time: 00:00:00.443
--- 20000 row(s) loaded.
>>--
@@ -219,18 +219,18 @@ Task: COMPLETION Status: Ended Elapsed Time: 00:00:00.407
>>load with no recovery into customer_demographics_salt
+>select * from hive.hive.customer_demographics where cd_demo_sk <= 20000;
Task: LOAD Status: Started Object: TRAFODION.HBASE.CUSTOMER_DEMOGRAPHICS_SALT
-Task: CLEANUP Status: Started Time: 2017-05-01 18:47:00.293
-Task: CLEANUP Status: Ended Time: 2017-05-01 18:47:00.311
-Task: CLEANUP Status: Ended Elapsed Time: 00:00:00.018
-Task: LOADING DATA Status: Started Time: 2017-05-01 18:47:00.311
+Task: CLEANUP Status: Started Time: 2017-08-15 14:54:12.393
+Task: CLEANUP Status: Ended Time: 2017-08-15 14:54:12.404
+Task: CLEANUP Status: Ended Elapsed Time: 00:00:00.011
+Task: LOADING DATA Status: Started Time: 2017-08-15 14:54:12.404
Rows Processed: 20000
Error Rows: 0
-Task: LOADING DATA Status: Ended Time: 2017-05-01 18:47:10.603
-Task: LOADING DATA Status: Ended Elapsed Time: 00:00:10.292
-Task: COMPLETION Status: Started Time: 2017-05-01 18:47:10.603
+Task: LOADING DATA Status: Ended Time: 2017-08-15 14:54:22.330
+Task: LOADING DATA Status: Ended Elapsed Time: 00:00:09.628
+Task: COMPLETION Status: Started Time: 2017-08-15 14:54:22.331
Rows Loaded: 20000
-Task: COMPLETION Status: Ended Time: 2017-05-01 18:47:11.346
-Task: COMPLETION Status: Ended Elapsed Time: 00:00:00.431
+Task: COMPLETION Status: Ended Time: 2017-08-15 14:54:22.384
+Task: COMPLETION Status: Ended Elapsed Time: 00:00:00.352
--- 20000 row(s) loaded.
>>--
@@ -246,18 +246,18 @@ Task: COMPLETION Status: Ended Elapsed Time: 00:00:00.431
>>load with no recovery into customer_salt
+>select * from hive.hive.customer;
Task: LOAD Status: Started Object: TRAFODION.HBASE.CUSTOMER_SALT
-Task: CLEANUP Status: Started Time: 2017-05-01 18:47:13.570
-Task: CLEANUP Status: Ended Time: 2017-05-01 18:47:13.584
+Task: CLEANUP Status: Started Time: 2017-08-15 14:54:25.112
+Task: CLEANUP Status: Ended Time: 2017-08-15 14:54:25.127
Task: CLEANUP Status: Ended Elapsed Time: 00:00:00.015
-Task: LOADING DATA Status: Started Time: 2017-05-01 18:47:13.584
+Task: LOADING DATA Status: Started Time: 2017-08-15 14:54:25.127
Rows Processed: 100000
Error Rows: 0
-Task: LOADING DATA Status: Ended Time: 2017-05-01 18:47:25.306
-Task: LOADING DATA Status: Ended Elapsed Time: 00:00:11.722
-Task: COMPLETION Status: Started Time: 2017-05-01 18:47:25.306
+Task: LOADING DATA Status: Ended Time: 2017-08-15 14:54:38.572
+Task: LOADING DATA Status: Ended Elapsed Time: 00:00:13.445
+Task: COMPLETION Status: Started Time: 2017-08-15 14:54:38.572
Rows Loaded: 100000
-Task: COMPLETION Status: Ended Time: 2017-05-01 18:47:25.645
-Task: COMPLETION Status: Ended Elapsed Time: 00:00:00.339
+Task: COMPLETION Status: Ended Time: 2017-08-15 14:54:38.978
+Task: COMPLETION Status: Ended Elapsed Time: 00:00:00.406
--- 100000 row(s) loaded.
>>--
@@ -282,18 +282,18 @@ Task: COMPLETION Status: Ended Elapsed Time: 00:00:00.339
>>load with no recovery into store_sales_salt
+>select * from hive.hive.store_sales where ss_item_sk <= 1000;
Task: LOAD Status: Started Object: TRAFODION.HBASE.STORE_SALES_SALT
-Task: CLEANUP Status: Started Time: 2017-05-01 18:47:28.700
-Task: CLEANUP Status: Ended Time: 2017-05-01 18:47:28.717
-Task: CLEANUP Status: Ended Elapsed Time: 00:00:00.017
-Task: LOADING DATA Status: Started Time: 2017-05-01 18:47:28.717
+Task: CLEANUP Status: Started Time: 2017-08-15 14:54:43.982
+Task: CLEANUP Status: Ended Time: 2017-08-15 14:54:43.114
+Task: CLEANUP Status: Ended Elapsed Time: 00:00:00.016
+Task: LOADING DATA Status: Started Time: 2017-08-15 14:54:43.114
Rows Processed: 160756
Error Rows: 0
-Task: LOADING DATA Status: Ended Time: 2017-05-01 18:47:42.429
-Task: LOADING DATA Status: Ended Elapsed Time: 00:00:13.711
-Task: COMPLETION Status: Started Time: 2017-05-01 18:47:42.429
+Task: LOADING DATA Status: Ended Time: 2017-08-15 14:54:57.277
+Task: LOADING DATA Status: Ended Elapsed Time: 00:00:14.163
+Task: COMPLETION Status: Started Time: 2017-08-15 14:54:57.277
Rows Loaded: 160756
-Task: COMPLETION Status: Ended Time: 2017-05-01 18:47:42.753
-Task: COMPLETION Status: Ended Elapsed Time: 00:00:00.324
+Task: COMPLETION Status: Ended Time: 2017-08-15 14:54:57.644
+Task: COMPLETION Status: Ended Elapsed Time: 00:00:00.367
--- 160756 row(s) loaded.
>>--
@@ -380,13 +380,13 @@ a
+> into '/user/trafodion/hive/exttables/null_format_default'
+> select * from null_format_src;
Task: UNLOAD Status: Started
-Task: EMPTY TARGET Status: Started Time: 2017-05-01 18:47:51.294
-Task: EMPTY TARGET Status: Ended Time: 2017-05-01 18:47:51.296
-Task: EMPTY TARGET Status: Ended Elapsed Time: 00:00:00.002
-Task: EXTRACT Status: Started Time: 2017-05-01 18:47:51.296
+Task: EMPTY TARGET Status: Started Time: 2017-08-15 14:55:09.437
+Task: EMPTY TARGET Status: Ended Time: 2017-08-15 14:55:09.493
+Task: EMPTY TARGET Status: Ended Elapsed Time: 00:00:00.006
+Task: EXTRACT Status: Started Time: 2017-08-15 14:55:09.494
Rows Processed: 10
-Task: EXTRACT Status: Ended Time: 2017-05-01 18:47:51.439
-Task: EXTRACT Status: Ended Elapsed Time: 00:00:00.142
+Task: EXTRACT Status: Ended Time: 2017-08-15 14:55:09.218
+Task: EXTRACT Status: Ended Elapsed Time: 00:00:00.169
--- 10 row(s) unloaded.
>>select * from hive.hive.null_format_default;
@@ -411,13 +411,13 @@ a
+> into '/user/trafodion/hive/exttables/null_format_empty'
+> select * from null_format_src;
Task: UNLOAD Status: Started
-Task: EMPTY TARGET Status: Started Time: 2017-05-01 18:47:52.194
-Task: EMPTY TARGET Status: Ended Time: 2017-05-01 18:47:52.195
-Task: EMPTY TARGET Status: Ended Elapsed Time: 00:00:00.002
-Task: EXTRACT Status: Started Time: 2017-05-01 18:47:52.195
+Task: EMPTY TARGET Status: Started Time: 2017-08-15 14:55:11.384
+Task: EMPTY TARGET Status: Ended Time: 2017-08-15 14:55:11.390
+Task: EMPTY TARGET Status: Ended Elapsed Time: 00:00:00.006
+Task: EXTRACT Status: Started Time: 2017-08-15 14:55:11.390
Rows Processed: 10
-Task: EXTRACT Status: Ended Time: 2017-05-01 18:47:52.297
-Task: EXTRACT Status: Ended Elapsed Time: 00:00:00.102
+Task: EXTRACT Status: Ended Time: 2017-08-15 14:55:11.610
+Task: EXTRACT Status: Ended Elapsed Time: 00:00:00.220
--- 10 row(s) unloaded.
>>select * from hive.hive.null_format_empty;
@@ -442,13 +442,13 @@ a ?
+> into '/user/trafodion/hive/exttables/null_format_colon'
+> select * from null_format_src;
Task: UNLOAD Status: Started
-Task: EMPTY TARGET Status: Started Time: 2017-05-01 18:47:53.342
-Task: EMPTY TARGET Status: Ended Time: 2017-05-01 18:47:53.357
-Task: EMPTY TARGET Status: Ended Elapsed Time: 00:00:00.001
-Task: EXTRACT Status: Started Time: 2017-05-01 18:47:53.358
+Task: EMPTY TARGET Status: Started Time: 2017-08-15 14:55:12.295
+Task: EMPTY TARGET Status: Ended Time: 2017-08-15 14:55:12.304
+Task: EMPTY TARGET Status: Ended Elapsed Time: 00:00:00.009
+Task: EXTRACT Status: Started Time: 2017-08-15 14:55:12.304
Rows Processed: 10
-Task: EXTRACT Status: Ended Time: 2017-05-01 18:47:53.305
-Task: EXTRACT Status: Ended Elapsed Time: 00:00:00.270
+Task: EXTRACT Status: Ended Time: 2017-08-15 14:55:12.440
+Task: EXTRACT Status: Ended Elapsed Time: 00:00:00.136
--- 10 row(s) unloaded.
>>select * from hive.hive.null_format_colon;
@@ -510,16 +510,16 @@ LC RC OP OPERATOR OPT DESCRIPTION CARD
+>select * from trafodion.hbase.customer_address
+>;
Task: UNLOAD Status: Started
-Task: EMPTY TARGET Status: Started Time: 2017-05-01 18:49:01.614
-Task: EMPTY TARGET Status: Ended Time: 2017-05-01 18:49:01.615
-Task: EMPTY TARGET Status: Ended Elapsed Time: 00:00:00.001
-Task: EXTRACT Status: Started Time: 2017-05-01 18:49:01.615
+Task: EMPTY TARGET Status: Started Time: 2017-08-15 14:56:07.950
+Task: EMPTY TARGET Status: Ended Time: 2017-08-15 14:56:07.102
+Task: EMPTY TARGET Status: Ended Elapsed Time: 00:00:00.007
+Task: EXTRACT Status: Started Time: 2017-08-15 14:56:07.102
Rows Processed: 50000
-Task: EXTRACT Status: Ended Time: 2017-05-01 18:49:02.955
-Task: EXTRACT Status: Ended Elapsed Time: 00:00:01.340
-Task: MERGE FILES Status: Started Time: 2017-05-01 18:49:02.955
-Task: MERGE FILES Status: Ended Time: 2017-05-01 18:49:02.995
-Task: MERGE FILES Status: Ended Elapsed Time: 00:00:00.040
+Task: EXTRACT Status: Ended Time: 2017-08-15 14:56:08.375
+Task: EXTRACT Status: Ended Elapsed Time: 00:00:01.274
+Task: MERGE FILES Status: Started Time: 2017-08-15 14:56:08.375
+Task: MERGE FILES Status: Ended Time: 2017-08-15 14:56:08.429
+Task: MERGE FILES Status: Ended Elapsed Time: 00:00:00.053
--- 50000 row(s) unloaded.
>>log;
@@ -551,16 +551,16 @@ LC RC OP OPERATOR OPT DESCRIPTION CARD
+>select * from trafodion.hbase.customer_demographics
+><<+ cardinality 10e10 >>;
Task: UNLOAD Status: Started
-Task: EMPTY TARGET Status: Started Time: 2017-05-01 18:49:06.594
-Task: EMPTY TARGET Status: Ended Time: 2017-05-01 18:49:06.602
-Task: EMPTY TARGET Status: Ended Elapsed Time: 00:00:00.008
-Task: EXTRACT Status: Started Time: 2017-05-01 18:49:06.602
+Task: EMPTY TARGET Status: Started Time: 2017-08-15 14:56:12.216
+Task: EMPTY TARGET Status: Ended Time: 2017-08-15 14:56:12.226
+Task: EMPTY TARGET Status: Ended Elapsed Time: 00:00:00.010
+Task: EXTRACT Status: Started Time: 2017-08-15 14:56:12.226
Rows Processed: 20000
-Task: EXTRACT Status: Ended Time: 2017-05-01 18:49:07.141
-Task: EXTRACT Status: Ended Elapsed Time: 00:00:00.539
-Task: MERGE FILES Status: Started Time: 2017-05-01 18:49:07.142
-Task: MERGE FILES Status: Ended Time: 2017-05-01 18:49:07.178
-Task: MERGE FILES Status: Ended Elapsed Time: 00:00:00.037
+Task: EXTRACT Status: Ended Time: 2017-08-15 14:56:12.740
+Task: EXTRACT Status: Ended Elapsed Time: 00:00:00.513
+Task: MERGE FILES Status: Started Time: 2017-08-15 14:56:12.740
+Task: MERGE FILES Status: Ended Time: 2017-08-15 14:56:12.792
+Task: MERGE FILES Status: Ended Elapsed Time: 00:00:00.052
--- 20000 row(s) unloaded.
>>log;
@@ -578,16 +578,16 @@ cat /tmp/merged_customer_demogs | wc -l
+>select * from trafodion.hbase.customer_demographics
+><<+ cardinality 10e10 >>;
Task: UNLOAD Status: Started
-Task: EMPTY TARGET Status: Started Time: 2017-05-01 18:49:10.514
-Task: EMPTY TARGET Status: Ended Time: 2017-05-01 18:49:10.521
-Task: EMPTY TARGET Status: Ended Elapsed Time: 00:00:00.007
-Task: EXTRACT Status: Started Time: 2017-05-01 18:49:10.521
+Task: EMPTY TARGET Status: Started Time: 2017-08-15 14:56:15.875
+Task: EMPTY TARGET Status: Ended Time: 2017-08-15 14:56:15.887
+Task: EMPTY TARGET Status: Ended Elapsed Time: 00:00:00.012
+Task: EXTRACT Status: Started Time: 2017-08-15 14:56:15.887
Rows Processed: 20000
-Task: EXTRACT Status: Ended Time: 2017-05-01 18:49:10.860
-Task: EXTRACT Status: Ended Elapsed Time: 00:00:00.339
-Task: MERGE FILES Status: Started Time: 2017-05-01 18:49:10.860
-Task: MERGE FILES Status: Ended Time: 2017-05-01 18:49:10.903
-Task: MERGE FILES Status: Ended Elapsed Time: 00:00:00.043
+Task: EXTRACT Status: Ended Time: 2017-08-15 14:56:16.341
+Task: EXTRACT Status: Ended Elapsed Time: 00:00:00.454
+Task: MERGE FILES Status: Started Time: 2017-08-15 14:56:16.341
+Task: MERGE FILES Status: Ended Time: 2017-08-15 14:56:16.380
+Task: MERGE FILES Status: Ended Elapsed Time: 00:00:00.039
--- 20000 row(s) unloaded.
>>log;
@@ -618,21 +618,22 @@ LC RC OP OPERATOR OPT DESCRIPTION CARD
+>select * from trafodion.hbase.customer_demographics_salt
+><<+ cardinality 10e10 >>;
Task: UNLOAD Status: Started
-Task: EMPTY TARGET Status: Started Time: 2017-05-01 18:49:16.748
-Task: EMPTY TARGET Status: Ended Time: 2017-05-01 18:49:16.761
-Task: EMPTY TARGET Status: Ended Elapsed Time: 00:00:00.001
-Task: EXTRACT Status: Started Time: 2017-05-01 18:49:16.761
+Task: EMPTY TARGET Status: Started Time: 2017-08-15 14:56:21.934
+Task: EMPTY TARGET Status: Ended Time: 2017-08-15 14:56:21.941
+Task: EMPTY TARGET Status: Ended Elapsed Time: 00:00:00.007
+Task: EXTRACT Status: Started Time: 2017-08-15 14:56:21.941
Rows Processed: 20000
-Task: EXTRACT Status: Ended Time: 2017-05-01 18:49:17.195
-Task: EXTRACT Status: Ended Elapsed Time: 00:00:00.943
-Task: MERGE FILES Status: Started Time: 2017-05-01 18:49:17.196
-Task: MERGE FILES Status: Ended Time: 2017-05-01 18:49:17.724
-Task: MERGE FILES Status: Ended Elapsed Time: 00:00:00.053
+Task: EXTRACT Status: Ended Time: 2017-08-15 14:56:23.323
+Task: EXTRACT Status: Ended Elapsed Time: 00:00:01.061
+Task: MERGE FILES Status: Started Time: 2017-08-15 14:56:23.328
+Task: MERGE FILES Status: Ended Time: 2017-08-15 14:56:23.624
+Task: MERGE FILES Status: Ended Elapsed Time: 00:00:00.059
--- 20000 row(s) unloaded.
>>
>>log;
regrhadoop.ksh fs -du -s /user/trafodion/bulkload/customer_demographics_salt/merged_customer_demogs_3
+778224 778224 /user/trafodion/bulkload/customer_demographics_salt/merged_customer_demogs_3
>>-------------------
>>--unload 5
>>UNLOAD
@@ -643,16 +644,16 @@ regrhadoop.ksh fs -du -s /user/trafodion/bulkload/customer_demographics_salt/mer
+>select * from trafodion.hbase.customer_demographics_salt
+><<+ cardinality 10e10 >>;
Task: UNLOAD Status: Started
-Task: EMPTY TARGET Status: Started Time: 2017-05-01 18:49:20.244
-Task: EMPTY TARGET Status: Ended Time: 2017-05-01 18:49:20.247
-Task: EMPTY TARGET Status: Ended Elapsed Time: 00:00:00.003
-Task: EXTRACT Status: Started Time: 2017-05-01 18:49:20.247
+Task: EMPTY TARGET Status: Started Time: 2017-08-15 14:56:26.136
+Task: EMPTY TARGET Status: Ended Time: 2017-08-15 14:56:26.145
+Task: EMPTY TARGET Status: Ended Elapsed Time: 00:00:00.009
+Task: EXTRACT Status: Started Time: 2017-08-15 14:56:26.145
Rows Processed: 20000
-Task: EXTRACT Status: Ended Time: 2017-05-01 18:49:20.801
-Task: EXTRACT Status: Ended Elapsed Time: 00:00:00.554
-Task: MERGE FILES Status: Started Time: 2017-05-01 18:49:20.801
-Task: MERGE FILES Status: Ended Time: 2017-05-01 18:49:20.849
-Task: MERGE FILES Status: Ended Elapsed Time: 00:00:00.048
+Task: EXTRACT Status: Ended Time: 2017-08-15 14:56:26.720
+Task: EXTRACT Status: Ended Elapsed Time: 00:00:00.575
+Task: MERGE FILES Status: Started Time: 2017-08-15 14:56:26.720
+Task: MERGE FILES Status: Ended Time: 2017-08-15 14:56:26.785
+Task: MERGE FILES Status: Ended Elapsed Time: 00:00:00.065
--- 20000 row(s) unloaded.
>>
@@ -684,13 +685,13 @@ LC RC OP OPERATOR OPT DESCRIPTION CARD
+>select * from trafodion.hbase.customer_demographics_salt
+><<+ cardinality 10e10 >>;
Task: UNLOAD Status: Started
-Task: EMPTY TARGET Status: Started Time: 2017-05-01 18:49:24.752
-Task: EMPTY TARGET Status: Ended Time: 2017-05-01 18:49:24.849
+Task: EMPTY TARGET Status: Started Time: 2017-08-15 14:56:30.146
+Task: EMPTY TARGET Status: Ended Time: 2017-08-15 14:56:30.248
Task: EMPTY TARGET Status: Ended Elapsed Time: 00:00:00.010
-Task: EXTRACT Status: Started Time: 2017-05-01 18:49:24.850
+Task: EXTRACT Status: Started Time: 2017-08-15 14:56:30.248
Rows Processed: 20000
-Task: EXTRACT Status: Ended Time: 2017-05-01 18:49:24.711
-Task: EXTRACT Status: Ended Elapsed Time: 00:00:00.626
+Task: EXTRACT Status: Ended Time: 2017-08-15 14:56:30.457
+Task: EXTRACT Status: Ended Elapsed Time: 00:00:00.432
--- 20000 row(s) unloaded.
>>
@@ -709,16 +710,16 @@ regrhadoop.ksh fs -ls /user/trafodion/bulkload/customer_demographics_salt/file*
+>select * from trafodion.hbase.customer_demographics_salt
+><<+ cardinality 10e10 >>;
Task: UNLOAD Status: Started
-Task: EMPTY TARGET Status: Started Time: 2017-05-01 18:49:30.834
-Task: EMPTY TARGET Status: Ended Time: 2017-05-01 18:49:30.854
-Task: EMPTY TARGET Status: Ended Elapsed Time: 00:00:00.020
-Task: EXTRACT Status: Started Time: 2017-05-01 18:49:30.854
+Task: EMPTY TARGET Status: Started Time: 2017-08-15 14:56:36.164
+Task: EMPTY TARGET Status: Ended Time: 2017-08-15 14:56:36.180
+Task: EMPTY TARGET Status: Ended Elapsed Time: 00:00:00.017
+Task: EXTRACT Status: Started Time: 2017-08-15 14:56:36.180
Rows Processed: 20000
-Task: EXTRACT Status: Ended Time: 2017-05-01 18:49:31.428
-Task: EXTRACT Status: Ended Elapsed Time: 00:00:00.574
-Task: MERGE FILES Status: Started Time: 2017-05-01 18:49:31.428
-Task: MERGE FILES Status: Ended Time: 2017-05-01 18:49:31.517
-Task: MERGE FILES Status: Ended Elapsed Time: 00:00:00.089
+Task: EXTRACT Status: Ended Time: 2017-08-15 14:56:36.616
+Task: EXTRACT Status: Ended Elapsed Time: 00:00:00.435
+Task: MERGE FILES Status: Started Time: 2017-08-15 14:56:36.616
+Task: MERGE FILES Status: Ended Time: 2017-08-15 14:56:36.675
+Task: MERGE FILES Status: Ended Elapsed Time: 00:00:00.060
--- 20000 row(s) unloaded.
>>
@@ -850,16 +851,16 @@ CD_DEMO_SK CD_GENDER
+>select * from trafodion.hbase.customer_demographics_salt
+><<+ cardinality 10e10 >>;
Task: UNLOAD Status: Started
-Task: EMPTY TARGET Status: Started Time: 2017-05-01 18:49:42.894
-Task: EMPTY TARGET Status: Ended Time: 2017-05-01 18:49:42.904
-Task: EMPTY TARGET Status: Ended Elapsed Time: 00:00:00.010
-Task: EXTRACT Status: Started Time: 2017-05-01 18:49:42.904
+Task: EMPTY TARGET Status: Started Time: 2017-08-15 14:56:47.463
+Task: EMPTY TARGET Status: Ended Time: 2017-08-15 14:56:47.531
+Task: EMPTY TARGET Status: Ended Elapsed Time: 00:00:00.007
+Task: EXTRACT Status: Started Time: 2017-08-15 14:56:47.531
Rows Processed: 20000
-Task: EXTRACT Status: Ended Time: 2017-05-01 18:49:43.534
-Task: EXTRACT Status: Ended Elapsed Time: 00:00:00.630
-Task: MERGE FILES Status: Started Time: 2017-05-01 18:49:43.534
-Task: MERGE FILES Status: Ended Time: 2017-05-01 18:49:43.583
-Task: MERGE FILES Status: Ended Elapsed Time: 00:00:00.049
+Task: EXTRACT Status: Ended Time: 2017-08-15 14:56:47.930
+Task: EXTRACT Status: Ended Elapsed Time: 00:00:00.877
+Task: MERGE FILES Status: Started Time: 2017-08-15 14:56:47.930
+Task: MERGE FILES Status: Ended Time: 2017-08-15 14:56:47.997
+Task: MERGE FILES Status: Ended Elapsed Time: 00:00:00.067
--- 20000 row(s) unloaded.
>>log;
@@ -893,16 +894,16 @@ regrhadoop.ksh fs -ls /user/trafodion/bulkload/customer_demographics_salt/merged
+>select * from trafodion.hbase.customer_demographics_salt
+><<+ cardinality 10e10 >>;
Task: UNLOAD Status: Started
-Task: EMPTY TARGET Status: Started Time: 2017-05-01 18:49:46.855
-Task: EMPTY TARGET Status: Ended Time: 2017-05-01 18:49:46.863
-Task: EMPTY TARGET Status: Ended Elapsed Time: 00:00:00.008
-Task: EXTRACT Status: Started Time: 2017-05-01 18:49:46.863
+Task: EMPTY TARGET Status: Started Time: 2017-08-15 14:56:50.956
+Task: EMPTY TARGET Status: Ended Time: 2017-08-15 14:56:50.966
+Task: EMPTY TARGET Status: Ended Elapsed Time: 00:00:00.010
+Task: EXTRACT Status: Started Time: 2017-08-15 14:56:50.966
Rows Processed: 20000
-Task: EXTRACT Status: Ended Time: 2017-05-01 18:49:47.716
-Task: EXTRACT Status: Ended Elapsed Time: 00:00:00.852
-Task: MERGE FILES Status: Started Time: 2017-05-01 18:49:47.716
-Task: MERGE FILES Status: Ended Time: 2017-05-01 18:49:47.799
-Task: MERGE FILES Status: Ended Elapsed Time: 00:00:00.083
+Task: EXTRACT Status: Ended Time: 2017-08-15 14:56:51.783
+Task: EXTRACT Status: Ended Elapsed Time: 00:00:00.817
+Task: MERGE FILES Status: Started Time: 2017-08-15 14:56:51.783
+Task: MERGE FILES Status: Ended Time: 2017-08-15 14:56:51.867
+Task: MERGE FILES Status: Ended Elapsed Time: 00:00:00.084
--- 20000 row(s) unloaded.
>>--sh sleep 10;
@@ -951,13 +952,13 @@ CD_DEMO_SK CD_GENDER
+>select * from trafodion.hbase.customer_demographics_salt
+><<+ cardinality 10e10 >>;
Task: UNLOAD Status: Started
-Task: EMPTY TARGET Status: Started Time: 2017-05-01 18:49:49.955
-Task: EMPTY TARGET Status: Ended Time: 2017-05-01 18:49:49.962
-Task: EMPTY TARGET Status: Ended Elapsed Time: 00:00:00.007
-Task: EXTRACT Status: Started Time: 2017-05-01 18:49:49.962
+Task: EMPTY TARGET Status: Started Time: 2017-08-15 14:56:54.325
+Task: EMPTY TARGET Status: Ended Time: 2017-08-15 14:56:54.331
+Task: EMPTY TARGET Status: Ended Elapsed Time: 00:00:00.006
+Task: EXTRACT Status: Started Time: 2017-08-15 14:56:54.331
Rows Processed: 20000
-Task: EXTRACT Status: Ended Time: 2017-05-01 18:49:50.550
-Task: EXTRACT Status: Ended Elapsed Time: 00:00:00.588
+Task: EXTRACT Status: Ended Time: 2017-08-15 14:56:54.845
+Task: EXTRACT Status: Ended Elapsed Time: 00:00:00.514
--- 20000 row(s) unloaded.
>>--sh sleep 10;
@@ -965,7 +966,7 @@ Task: EXTRACT Status: Ended Elapsed Time: 00:00:00.588
*** WARNING[8597] Statement was automatically retried 1 time(s). Delay before each retry was 0 seconds. See next entry for the error that caused this retry.
-*** WARNING[8436] Mismatch detected between compiletime and runtime hive table definitions. DataModMismatchDetails: compiledModTS = 1493664587, failedModTS = 1493664590, failedLoc = hdfs://localhost:25600/user/trafodion/hive/exttables/unload_customer_demographics
+*** WARNING[8436] Mismatch detected between compiletime and runtime hive table definitions. DataModMismatchDetails: compiledModTS = 1502809011, failedModTS = 1502809014, failedLoc = hdfs://localhost:25600/user/trafodion/hive/exttables/unload_customer_demographics
(EXPR)
--------------------
@@ -1007,13 +1008,13 @@ CD_DEMO_SK CD_GENDER
+>INTO '/user/trafodion/hive/exttables/unload_customer_address'
+>select * from trafodion.hbase.customer_address ;
Task: UNLOAD Status: Started
-Task: EMPTY TARGET Status: Started Time: 2017-05-01 18:49:53.855
-Task: EMPTY TARGET Status: Ended Time: 2017-05-01 18:49:53.858
-Task: EMPTY TARGET Status: Ended Elapsed Time: 00:00:00.003
-Task: EXTRACT Status: Started Time: 2017-05-01 18:49:53.858
+Task: EMPTY TARGET Status: Started Time: 2017-08-15 14:56:57.715
+Task: EMPTY TARGET Status: Ended Time: 2017-08-15 14:56:57.722
+Task: EMPTY TARGET Status: Ended Elapsed Time: 00:00:00.007
+Task: EXTRACT Status: Started Time: 2017-08-15 14:56:57.722
Rows Processed: 50000
-Task: EXTRACT Status: Ended Time: 2017-05-01 18:49:54.791
-Task: EXTRACT Status: Ended Elapsed Time: 00:00:00.933
+Task: EXTRACT Status: Ended Time: 2017-08-15 14:56:58.660
+Task: EXTRACT Status: Ended Elapsed Time: 00:00:00.938
--- 50000 row(s) unloaded.
>>--sh sleep 10;
@@ -1062,13 +1063,13 @@ CA_ADDRESS_SK CA_ADDRESS_ID
+>INTO '/user/trafodion/hive/exttables/unload_customer_address'
+>select * from trafodion.hbase.customer_address ;
Task: UNLOAD Status: Started
-Task: EMPTY TARGET Status: Started Time: 2017-05-01 18:49:57.416
-Task: EMPTY TARGET Status: Ended Time: 2017-05-01 18:49:57.421
-Task: EMPTY TARGET Status: Ended Elapsed Time: 00:00:00.006
-Task: EXTRACT Status: Started Time: 2017-05-01 18:49:57.422
+Task: EMPTY TARGET Status: Started Time: 2017-08-15 14:57:02.463
+Task: EMPTY TARGET Status: Ended Time: 2017-08-15 14:57:02.470
+Task: EMPTY TARGET Status: Ended Elapsed Time: 00:00:00.007
+Task: EXTRACT Status: Started Time: 2017-08-15 14:57:02.470
Rows Processed: 50000
-Task: EXTRACT Status: Ended Time: 2017-05-01 18:49:58.307
-Task: EXTRACT Status: Ended Elapsed Time: 00:00:00.885
+Task: EXTRACT Status: Ended Time: 2017-08-15 14:57:03.210
+Task: EXTRACT Status: Ended Elapsed Time: 00:00:00.740
--- 50000 row(s) unloaded.
>>--sh sleep 10;
@@ -1076,7 +1077,7 @@ Task: EXTRACT Status: Ended Elapsed Time: 00:00:00.885
*** WARNING[8597] Statement was automatically retried 1 time(s). Delay before each retry was 0 seconds. See next entry for the error that caused this retry.
-*** WARNING[8436] Mismatch detected between compiletime and runtime hive table definitions. DataModMismatchDetails: compiledModTS = 1493664594, failedModTS = 1493664597, failedLoc = hdfs://localhost:25600/user/trafodion/hive/exttables/unload_customer_address
+*** WARNING[8436] Mismatch detected between compiletime and runtime hive table definitions. DataModMismatchDetails: compiledModTS = 1502809018, failedModTS = 1502809022, failedLoc = hdfs://localhost:25600/user/trafodion/hive/exttables/unload_customer_address
(EXPR)
--------------------
@@ -1130,13 +1131,13 @@ CA_ADDRESS_SK CA_ADDRESS_ID
+>INTO '/user/trafodion/hive/exttables/unload_customer'
+>select * from trafodion.hbase.customer_salt;
Task: UNLOAD Status: Started
-Task: EMPTY TARGET Status: Started Time: 2017-05-01 18:50:01.495
-Task: EMPTY TARGET Status: Ended Time: 2017-05-01 18:50:01.497
-Task: EMPTY TARGET Status: Ended Elapsed Time: 00:00:00.002
-Task: EXTRACT Status: Started Time: 2017-05-01 18:50:01.497
+Task: EMPTY TARGET Status: Started Time: 2017-08-15 14:57:08.695
+Task: EMPTY TARGET Status: Ended Time: 2017-08-15 14:57:08.701
+Task: EMPTY TARGET Status: Ended Elapsed Time: 00:00:00.007
+Task: EXTRACT Status: Started Time: 2017-08-15 14:57:08.701
Rows Processed: 100000
-Task: EXTRACT Status: Ended Time: 2017-05-01 18:50:04.887
-Task: EXTRACT Status: Ended Elapsed Time: 00:00:03.390
+Task: EXTRACT Status: Ended Time: 2017-08-15 14:57:12.919
+Task: EXTRACT Status: Ended Elapsed Time: 00:00:04.217
--- 100000 row(s) unloaded.
>>--sh sleep 10;
@@ -1186,13 +1187,13 @@ C_CUSTOMER_SK C_CUSTOMER_ID
+>INTO '/user/trafodion/hive/exttables/unload_customer_demographics'
+>select * from trafodion.hbase.customer_demographics_salt;
Task: UNLOAD Status: Started
-Task: EMPTY TARGET Status: Started Time: 2017-05-01 18:50:07.724
-Task: EMPTY TARGET Status: Ended Time: 2017-05-01 18:50:07.734
-Task: EMPTY TARGET Status: Ended Elapsed Time: 00:00:00.009
-Task: EXTRACT Status: Started Time: 2017-05-01 18:50:07.734
+Task: EMPTY TARGET Status: Started Time: 2017-08-15 14:57:15.925
+Task: EMPTY TARGET Status: Ended Time: 2017-08-15 14:57:15.936
+Task: EMPTY TARGET Status: Ended Elapsed Time: 00:00:00.012
+Task: EXTRACT Status: Started Time: 2017-08-15 14:57:15.937
Rows Processed: 20000
-Task: EXTRACT Status: Ended Time: 2017-05-01 18:50:08.712
-Task: EXTRACT Status: Ended Elapsed Time: 00:00:00.337
+Task: EXTRACT Status: Ended Time: 2017-08-15 14:57:16.236
+Task: EXTRACT Status: Ended Elapsed Time: 00:00:00.299
--- 20000 row(s) unloaded.
>>--sh sleep 10;
@@ -1241,16 +1242,16 @@ CD_DEMO_SK CD_GENDER
+>INTO '/user/trafodion/bulkload/customer_address'
+>select * from trafodion.hbase.customer_address where ca_address_sk < 100;
Task: UNLOAD Status: Started
-Task: EMPTY TARGET Status: Started Time: 2017-05-01 18:50:10.860
-Task: EMPTY TARGET Status: Ended Time: 2017-05-01 18:50:10.909
-Task: EMPTY TARGET Status: Ended Elapsed Time: 00:00:00.005
-Task: EXTRACT Status: Started Time: 2017-05-01 18:50:10.910
+Task: EMPTY TARGET Status: Started Time: 2017-08-15 14:57:18.175
+Task: EMPTY TARGET Status: Ended Time: 2017-08-15 14:57:18.182
+Task: EMPTY TARGET Status: Ended Elapsed Time: 00:00:00.007
+Task: EXTRACT Status: Started Time: 2017-08-15 14:57:18.182
Rows Processed: 99
-Task: EXTRACT Status: Ended Time: 2017-05-01 18:50:10.159
-Task: EXTRACT Status: Ended Elapsed Time: 00:00:00.068
-Task: MERGE FILES Status: Started Time: 2017-05-01 18:50:10.159
-Task: MERGE FILES Status: Ended Time: 2017-05-01 18:50:10.193
-Task: MERGE FILES Status: Ended Elapsed Time: 00:00:00.034
+Task: EXTRACT Status: Ended Time: 2017-08-15 14:57:18.248
+Task: EXTRACT Status: Ended Elapsed Time: 00:00:00.065
+Task: MERGE FILES Status: Started Time: 2017-08-15 14:57:18.248
+Task: MERGE FILES Status: Ended Time: 2017-08-15 14:57:18.284
+Task: MERGE FILES Status: Ended Elapsed Time: 00:00:00.036
--- 99 row(s) unloaded.
>>
@@ -1285,13 +1286,13 @@ regrhadoop.ksh fs -rm /user/trafodion/hive/exttables/unload_customer_demographic
+>INTO '/user/trafodion/hive/exttables/unload_store_sales_summary'
+>select ss_sold_date_sk,ss_store_sk, sum (ss_quantity) from store_sales_salt group by ss_sold_date_sk ,ss_store_sk;
Task: UNLOAD Status: Started
-Task: EMPTY TARGET Status: Started Time: 2017-05-01 18:50:13.905
-Task: EMPTY TARGET Status: Ended Time: 2017-05-01 18:50:13.912
-Task: EMPTY TARGET Status: Ended Elapsed Time: 00:00:00.008
-Task: EXTRACT Status: Started Time: 2017-05-01 18:50:13.912
+Task: EMPTY TARGET Status: Started Time: 2017-08-15 14:57:21.794
+Task: EMPTY TARGET Status: Ended Time: 2017-08-15 14:57:21.809
+Task: EMPTY TARGET Status: Ended Elapsed Time: 00:00:00.014
+Task: EXTRACT Status: Started Time: 2017-08-15 14:57:21.809
Rows Processed: 12349
-Task: EXTRACT Status: Ended Time: 2017-05-01 18:50:18.119
-Task: EXTRACT Status: Ended Elapsed Time: 00:00:04.207
+Task: EXTRACT Status: Ended Time: 2017-08-15 14:57:26.261
+Task: EXTRACT Status: Ended Elapsed Time: 00:00:04.452
--- 12349 row(s) unloaded.
>>--sh sleep 10;
@@ -1409,13 +1410,13 @@ SS_SOLD_DATE_SK SS_STORE_SK SS_QUANTITY
+>INTO '/user/trafodion/hive/exttables/unload_customer_and_address'
+>select * from trafodion.hbase.customer_salt c join trafodion.hbase.customer_address ca on c.c_current_addr_sk = ca.ca_address_sk ;
Task: UNLOAD Status: Started
-Task: EMPTY TARGET Status: Started Time: 2017-05-01 18:50:20.184
-Task: EMPTY TARGET Status: Ended Time: 2017-05-01 18:50:20.186
-Task: EMPTY TARGET Status: Ended Elapsed Time: 00:00:00.003
-Task: EXTRACT Status: Started Time: 2017-05-01 18:50:20.186
+Task: EMPTY TARGET Status: Started Time: 2017-08-15 14:57:28.396
+Task: EMPTY TARGET Status: Ended Time: 2017-08-15 14:57:28.406
+Task: EMPTY TARGET Status: Ended Elapsed Time: 00:00:00.010
+Task: EXTRACT Status: Started Time: 2017-08-15 14:57:28.406
Rows Processed: 100000
-Task: EXTRACT Status: Ended Time: 2017-05-01 18:50:23.138
-Task: EXTRACT Status: Ended Elapsed Time: 00:00:02.952
+Task: EXTRACT Status: Ended Time: 2017-08-15 14:57:31.408
+Task: EXTRACT Status: Ended Elapsed Time: 00:00:03.002
--- 100000 row(s) unloaded.
>>--sh sleep 10;
@@ -1462,13 +1463,13 @@ C_CUSTOMER_SK C_CUSTOMER_ID
+>INTO '/user/trafodion/hive/exttables/unload_customer_address'
+>select * from customer_address where ca_address_sk < 1000 union select * from customer_address where ca_address_sk > 40000 and ca_address_sk < 41000;
Task: UNLOAD Status: Started
-Task: EMPTY TARGET Status: Started Time: 2017-05-01 18:50:27.804
-Task: EMPTY TARGET Status: Ended Time: 2017-05-01 18:50:27.810
-Task: EMPTY TARGET Status: Ended Elapsed Time: 00:00:00.005
-Task: EXTRACT Status: Started Time: 2017-05-01 18:50:27.810
+Task: EMPTY TARGET Status: Started Time: 2017-08-15 14:57:36.424
+Task: EMPTY TARGET Status: Ended Time: 2017-08-15 14:57:36.432
+Task: EMPTY TARGET Status: Ended Elapsed Time: 00:00:00.008
+Task: EXTRACT Status: Started Time: 2017-08-15 14:57:36.432
Rows Processed: 1998
-Task: EXTRACT Status: Ended Time: 2017-05-01 18:50:28.224
-Task: EXTRACT Status: Ended Elapsed Time: 00:00:00.415
+Task: EXTRACT Status: Ended Time: 2017-08-15 14:57:36.875
+Task: EXTRACT Status: Ended Elapsed Time: 00:00:00.443
--- 1998 row(s) unloaded.
>>--sh sleep 10;
@@ -1579,7 +1580,7 @@ ESP_EXCHANGE ============================== SEQ_NO 3 ONLY CHILD 2
use_snapshot_scan ...... TRUE
full_table_name ........ TRAFODION.HBASE.CUSTOMER_DEMOGRAPHICS_SALT
snapshot_name .......... TRAFODION.HBASE.CUSTOMER_DEMOGRAPHICS_SALT_SNAP111
- snapshot_temp_location /user/trafodion/bulkload/20170501185033/
+ snapshot_temp_location /user/trafodion/bulkload/20170815145742/
grep -i -e 'explain reg' -e snapshot -e full_table_name -e esp_exchange LOG018_REGULAR_SCAN_PLAN.TXT | grep -v snapshot_scan_run_id
>>--no snapshot
>>explain reg;
@@ -1663,7 +1664,7 @@ grep -i -e 'explain snp' -e snapshot -e full_table_name -e esp_exchange LOG018_S
use_snapshot_scan ...... TRUE
full_table_name ........ TRAFODION.HBASE.CUSTOMER_ADDRESS
snapshot_name .......... TRAFODION.HBASE.CUSTOMER_ADDRESS_SNAP111
- snapshot_temp_location /user/trafodion/bulkload/20170501185041/
+ snapshot_temp_location /user/trafodion/bulkload/20170815145852/
grep -i -e 'explain reg' -e snapshot -e full_table_name -e esp_exchange LOG018_REGULAR_SCAN_PLAN.TXT | grep -v snapshot_scan_run_id
>>--no snapshot
>>explain reg;
@@ -1758,12 +1759,12 @@ ESP_EXCHANGE ============================== SEQ_NO 6 ONLY CHILD 5
use_snapshot_scan ...... TRUE
full_table_name ........ TRAFODION.HBASE.CUSTOMER_SALT
snapshot_name .......... TRAFODION.HBASE.CUSTOMER_SALT_SNAP111
- snapshot_temp_location /user/trafodion/bulkload/20170501185103/
+ snapshot_temp_location /user/trafodion/bulkload/20170815145917/
ESP_EXCHANGE ============================== SEQ_NO 2 ONLY CHILD 1
use_snapshot_scan ...... TRUE
full_table_name ........ TRAFODION.HBASE.CUSTOMER_ADDRESS
snapshot_name .......... TRAFODION.HBASE.CUSTOMER_ADDRESS_SNAP111
- snapshot_temp_location /user/trafodion/bulkload/20170501185103/
+ snapshot_temp_location /user/trafodion/bulkload/20170815145917/
grep -i -e 'explain reg' -e snapshot -e full_table_name -e esp_exchange LOG018_REGULAR_SCAN_PLAN.TXT | grep -v snapshot_scan_run_id
>>--no snapshot
>>explain reg;
@@ -1881,17 +1882,17 @@ LC RC OP OPERATOR OPT DESCRIPTION CARD
+>select * from customer_address
+><<+ cardinality 10e10 >>;
Task: UNLOAD Status: Started
-Task: EMPTY TARGET Status: Started Time: 2017-05-01 18:52:43.214
-Task: EMPTY TARGET Status: Ended Time: 2017-05-01 18:52:43.224
-Task: EMPTY TARGET Status: Ended Elapsed Time: 00:00:00.009
-Task: VERIFY SNAPSHO Status: Started Time: 2017-05-01 18:52:43.224
+Task: EMPTY TARGET Status: Started Time: 2017-08-15 15:02:14.544
+Task: EMPTY TARGET Status: Ended Time: 2017-08-15 15:02:14.550
+Task: EMPTY TARGET Status: Ended Elapsed Time: 00:00:00.006
+Task: VERIFY SNAPSHO Status: Started Time: 2017-08-15 15:02:14.550
Snapshots verified: 1
-Task: VERIFY SNAPSHO Status: Ended Time: 2017-05-01 18:52:43.607
-Task: VERIFY SNAPSHO Status: Ended Elapsed Time: 00:00:00.383
-Task: EXTRACT Status: Started Time: 2017-05-01 18:52:43.607
+Task: VERIFY SNAPSHO Status: Ended Time: 2017-08-15 15:02:15.334
+Task: VERIFY SNAPSHO Status: Ended Elapsed Time: 00:00:00.784
+Task: EXTRACT Status: Started Time: 2017-08-15 15:02:15.334
Rows Processed: 50000
-Task: EXTRACT Status: Ended Time: 2017-05-01 18:52:44.813
-Task: EXTRACT Status: Ended Elapsed Time: 00:00:01.206
+Task: EXTRACT Status: Ended Time: 2017-08-15 15:02:16.637
+Task: EXTRACT Status: Ended Elapsed Time: 00:00:01.302
--- 50000 row(s) unloaded.
>>
@@ -1962,17 +1963,17 @@ LC RC OP OPERATOR OPT DESCRIPTION CARD
+>INTO '/user/trafodion/hive/exttables/unload_customer_demographics'
+>select * from trafodion.hbase.customer_demographics_salt <<+ cardinality 10e10 >>;
Task: UNLOAD Status: Started
-Task: EMPTY TARGET Status: Started Time: 2017-05-01 18:52:48.844
-Task: EMPTY TARGET Status: Ended Time: 2017-05-01 18:52:48.846
-Task: EMPTY TARGET Status: Ended Elapsed Time: 00:00:00.002
-Task: VERIFY SNAPSHO Status: Started Time: 2017-05-01 18:52:48.846
+Task: EMPTY TARGET Status: Started Time: 2017-08-15 15:02:20.874
+Task: EMPTY TARGET Status: Ended Time: 2017-08-15 15:02:20.878
+Task: EMPTY TARGET Status: Ended Elapsed Time: 00:00:00.003
+Task: VERIFY SNAPSHO Status: Started Time: 2017-08-15 15:02:20.878
Snapshots verified: 1
-Task: VERIFY SNAPSHO Status: Ended Time: 2017-05-01 18:52:49.204
-Task: VERIFY SNAPSHO Status: Ended Elapsed Time: 00:00:00.358
-Task: EXTRACT Status: Started Time: 2017-05-01 18:52:49.204
+Task: VERIFY SNAPSHO Status: Ended Time: 2017-08-15 15:02:21.318
+Task: VERIFY SNAPSHO Status: Ended Elapsed Time: 00:00:00.440
+Task: EXTRACT Status: Started Time: 2017-08-15 15:02:21.318
Rows Processed: 20000
-Task: EXTRACT Status: Ended Time: 2017-05-01 18:52:57.416
-Task: EXTRACT Status: Ended Elapsed Time: 00:00:08.211
+Task: EXTRACT Status: Ended Time: 2017-08-15 15:02:30.925
+Task: EXTRACT Status: Ended Elapsed Time: 00:00:08.774
--- 20000 row(s) unloaded.
>>
@@ -2019,21 +2020,21 @@ CD_DEMO_SK CD_GENDER
+>INTO '/user/trafodion/hive/exttables/unload_customer_demographics'
+>select * from trafodion.hbase.customer_demographics_salt <<+ cardinality 10e10 >>;
Task: UNLOAD Status: Started
-Task: EMPTY TARGET Status: Started Time: 2017-05-01 18:52:59.366
-Task: EMPTY TARGET Status: Ended Time: 2017-05-01 18:52:59.377
-Task: EMPTY TARGET Status: Ended Elapsed Time: 00:00:00.011
-Task: CREATE SNAPSHO Status: Started Time: 2017-05-01 18:52:59.377
+Task: EMPTY TARGET Status: Started Time: 2017-08-15 15:02:32.124
+Task: EMPTY TARGET Status: Ended Time: 2017-08-15 15:02:32.137
+Task: EMPTY TARGET Status: Ended Elapsed Time: 00:00:00.014
+Task: CREATE SNAPSHO Status: Started Time: 2017-08-15 15:02:32.138
Snapshots created: 1
-Task: CREATE SNAPSHO Status: Ended Time: 2017-05-01 18:53:00.390
-Task: CREATE SNAPSHO Status: Ended Elapsed Time: 00:00:01.013
-Task: EXTRACT Status: Started Time: 2017-05-01 18:53:00.393
+Task: CREATE SNAPSHO Status: Ended Time: 2017-08-15 15:02:33.364
+Task: CREATE SNAPSHO Status: Ended Elapsed Time: 00:00:01.227
+Task: EXTRACT Status: Started Time: 2017-08-15 15:02:33.364
Rows Processed: 20000
-Task: EXTRACT Status: Ended Time: 2017-05-01 18:53:01.609
-Task: EXTRACT Status: Ended Elapsed Time: 00:00:01.216
-Task: DELETE SNAPSHO Status: Started Time: 2017-05-01 18:53:01.609
+Task: EXTRACT Status: Ended Time: 2017-08-15 15:02:34.688
+Task: EXTRACT Status: Ended Elapsed Time: 00:00:01.323
+Task: DELETE SNAPSHO Status: Started Time: 2017-08-15 15:02:34.688
Snapshots deleted: 1
-Task: DELETE SNAPSHO Status: Ended Time: 2017-05-01 18:53:01.627
-Task: DELETE SNAPSHO Status: Ended Elapsed Time: 00:00:00.018
+Task: DELETE SNAPSHO Status: Ended Time: 2017-08-15 15:02:34.720
+Task: DELETE SNAPSHO Status: Ended Elapsed Time: 00:00:00.032
--- 20000 row(s) unloaded.
>>
@@ -2041,7 +2042,7 @@ Task: DELETE SNAPSHO Status: Ended Elapsed Time: 00:00:00.018
*** WARNING[8597] Statement was automatically retried 1 time(s). Delay before each retry was 0 seconds. See next entry for the error that caused this retry.
-*** WARNING[8436] Mismatch detected between compiletime and runtime hive table definitions. DataModMismatchDetails: compiledModTS = 1493664777, failedModTS = 1493664780, failedLoc = hdfs://localhost:25600/user/trafodion/hive/exttables/unload_customer_demographics
+*** WARNING[8436] Mismatch detected between compiletime and runtime hive table definitions. DataModMismatchDetails: compiledModTS = 1502809349, failedModTS = 1502809353, failedLoc = hdfs://localhost:25600/user/trafodion/hive/exttables/unload_customer_demographics
(EXPR)
--------------------
@@ -2084,21 +2085,21 @@ CD_DEMO_SK CD_GENDER
+>INTO '/user/trafodion/hive/exttables/unload_customer_demographics'
+>select * from trafodion.hbase.customer_demographics_salt <<+ cardinality 10e10 >>;
Task: UNLOAD Status: Started
-Task: EMPTY TARGET Status: Started Time: 2017-05-01 18:53:04.714
-Task: EMPTY TARGET Status: Ended Time: 2017-05-01 18:53:04.726
-Task: EMPTY TARGET Status: Ended Elapsed Time: 00:00:00.012
-Task: CREATE SNAPSHO Status: Started Time: 2017-05-01 18:53:04.726
+Task: EMPTY TARGET Status: Started Time: 2017-08-15 15:02:37.723
+Task: EMPTY TARGET Status: Ended Time: 2017-08-15 15:02:37.733
+Task: EMPTY TARGET Status: Ended Elapsed Time: 00:00:00.010
+Task: CREATE SNAPSHO Status: Started Time: 2017-08-15 15:02:37.733
Snapshots created: 1
-Task: CREATE SNAPSHO Status: Ended Time: 2017-05-01 18:53:06.337
-Task: CREATE SNAPSHO Status: Ended Elapsed Time: 00:00:01.611
-Task: EXTRACT Status: Started Time: 2017-05-01 18:53:06.337
+Task: CREATE SNAPSHO Status: Ended Time: 2017-08-15 15:02:38.443
+Task: CREATE SNAPSHO Status: Ended Elapsed Time: 00:00:00.710
+Task: EXTRACT Status: Started Time: 2017-08-15 15:02:38.443
Rows Processed: 20000
-Task: EXTRACT Status: Ended Time: 2017-05-01 18:53:07.193
-Task: EXTRACT Status: Ended Elapsed Time: 00:00:00.856
-Task: DELETE SNAPSHO Status: Started Time: 2017-05-01 18:53:07.193
+Task: EXTRACT Status: Ended Time: 2017-08-15 15:02:40.918
+Task: EXTRACT Status: Ended Elapsed Time: 00:00:01.648
+Task: DELETE SNAPSHO Status: Started Time: 2017-08-15 15:02:40.919
Snapshots deleted: 1
-Task: DELETE SNAPSHO Status: Ended Time: 2017-05-01 18:53:07.204
-Task: DELETE SNAPSHO Status: Ended Elapsed Time: 00:00:00.011
+Task: DELETE SNAPSHO Status: Ended Time: 2017-08-15 15:02:40.989
+Task: DELETE SNAPSHO Status: Ended Elapsed Time: 00:00:00.007
--- 20000 row(s) unloaded.
>>
@@ -2114,7 +2115,7 @@ Task: DELETE SNAPSHO Status: Ended Elapsed Time: 00:00:00.011
*** WARNING[8597] Statement was automatically retried 1 time(s). Delay before each retry was 0 seconds. See next entry for the error that caused this retry.
-*** WARNING[8436] Mismatch detected between compiletime and runtime hive table definitions. DataModMismatchDetails: compiledModTS = 1493664781, failedModTS = 1493664786, failedLoc = hdfs://localhost:25600/user/trafodion/hive/exttables/unload_customer_demographics
+*** WARNING[8436] Mismatch detected between compiletime and runtime hive table definitions. DataModMismatchDetails: compiledModTS = 1502809354, failedModTS = 1502809358, failedLoc = hdfs://localhost:25600/user/trafodion/hive/exttables/unload_customer_demographics
CD_DEMO_SK CD_GENDER CD_MARITAL_STATUS CD_EDUCATION_STATUS CD_PURCHASE_ESTIMATE CD_CREDIT_RATING CD_DEP_COUNT CD_DEP_EMPLOYED_COUNT CD_DEP_COLLEGE_COUNT
----------- ---------------------------------------------------------------------------------------------------- ---------------------------------------------------------------------------------------------------- ---------------------------------------------------------------------------------------------------- -------------------- ---------------------------------------------------------------------------------------------------- ------------ --------------------- --------------------
@@ -2150,21 +2151,21 @@ CD_DEMO_SK CD_GENDER
+>INTO '/user/trafodion/hive/exttables/unload_customer_address'
+>select * from customer_address where ca_address_sk < 1000 union select * from customer_address where ca_address_sk > 40000 and ca_address_sk < 41000;
Task: UNLOAD Status: Started
-Task: EMPTY TARGET Status: Started Time: 2017-05-01 18:53:10.415
-Task: EMPTY TARGET Status: Ended Time: 2017-05-01 18:53:10.420
-Task: EMPTY TARGET Status: Ended Elapsed Time: 00:00:00.005
-Task: CREATE SNAPSHO Status: Started Time: 2017-05-01 18:53:10.420
+Task: EMPTY TARGET Status: Started Time: 2017-08-15 15:02:43.246
+Task: EMPTY TARGET Status: Ended Time: 2017-08-15 15:02:43.252
+Task: EMPTY TARGET Status: Ended Elapsed Time: 00:00:00.006
+Task: CREATE SNAPSHO Status: Started Time: 2017-08-15 15:02:43.252
Snapshots created: 1
-Task: CREATE SNAPSHO Status: Ended Time: 2017-05-01 18:53:11.649
-Task: CREATE SNAPSHO Status: Ended Elapsed Time: 00:00:01.228
-Task: EXTRACT Status: Started Time: 2017-05-01 18:53:11.649
+Task: CREATE SNAPSHO Status: Ended Time: 2017-08-15 15:02:44.110
+Task: CREATE SNAPSHO Status: Ended Elapsed Time: 00:00:00.858
+Task: EXTRACT Status: Started Time: 2017-08-15 15:02:44.110
Rows Processed: 1998
-Task: EXTRACT Status: Ended Time: 2017-05-01 18:53:12.226
-Task: EXTRACT Status: Ended Elapsed Time: 00:00:00.577
-Task: DELETE SNAPSHO Status: Started Time: 2017-05-01 18:53:12.226
+Task: EXTRACT Status: Ended Time: 2017-08-15 15:02:44.980
+Task: EXTRACT Status: Ended Elapsed Time: 00:00:00.870
+Task: DELETE SNAPSHO Status: Started Time: 2017-08-15 15:02:44.980
Snapshots deleted: 1
-Task: DELETE SNAPSHO Status: Ended Time: 2017-05-01 18:53:12.234
-Task: DELETE SNAPSHO Status: Ended Elapsed Time: 00:00:00.008
+Task: DELETE SNAPSHO Status: Ended Time: 2017-08-15 15:02:44.986
+Task: DELETE SNAPSHO Status: Ended Elapsed Time: 00:00:00.006
--- 1998 row(s) unloaded.
>>
@@ -2238,21 +2239,21 @@ CA_ADDRESS_SK CA_ADDRESS_ID
+>INTO '/user/trafodion/hive/exttables/unload_customer_and_address'
+>select * from trafodion.hbase.customer_salt c join trafodion.hbase.customer_address ca on c.c_current_addr_sk = ca.ca_address_sk ;
Task: UNLOAD Status: Started
-Task: EMPTY TARGET Status: Started Time: 2017-05-01 18:53:14.484
-Task: EMPTY TARGET Status: Ended Time: 2017-05-01 18:53:14.491
+Task: EMPTY TARGET Status: Started Time: 2017-08-15 15:02:47.233
+Task: EMPTY TARGET Status: Ended Time: 2017-08-15 15:02:47.240
Task: EMPTY TARGET Status: Ended Elapsed Time: 00:00:00.007
-Task: CREATE SNAPSHO Status: Started Time: 2017-05-01 18:53:14.491
+Task: CREATE SNAPSHO Status: Started Time: 2017-08-15 15:02:47.240
Snapshots created: 2
-Task: CREATE SNAPSHO Status: Ended Time: 2017-05-01 18:53:17.824
-Task: CREATE SNAPSHO Status: Ended Elapsed Time: 00:00:03.333
-Task: EXTRACT Status: Started Time: 2017-05-01 18:53:17.824
+Task: CREATE SNAPSHO Status: Ended Time: 2017-08-15 15:02:50.272
+Task: CREATE SNAPSHO Status: Ended Elapsed Time: 00:00:03.032
+Task: EXTRACT Status: Started Time: 2017-08-15 15:02:50.272
Rows Processed: 100000
-Task: EXTRACT Status: Ended Time: 2017-05-01 18:53:22.629
-Task: EXTRACT Status: Ended Elapsed Time: 00:00:04.176
-Task: DELETE SNAPSHO Status: Started Time: 2017-05-01 18:53:22.736
+Task: EXTRACT Status: Ended Time: 2017-08-15 15:02:54.174
+Task: EXTRACT Status: Ended Elapsed Time: 00:00:03.902
+Task: DELETE SNAPSHO Status: Started Time: 2017-08-15 15:02:54.174
Snapshots deleted: 2
-Task: DELETE SNAPSHO Status: Ended Time: 2017-05-01 18:53:22.197
-Task: DELETE SNAPSHO Status: Ended Elapsed Time: 00:00:00.019
+Task: DELETE SNAPSHO Status: Ended Time: 2017-08-15 15:02:54.186
+Task: DELETE SNAPSHO Status: Ended Elapsed Time: 00:00:00.012
--- 100000 row(s) unloaded.
>>--sh sleep 10;
@@ -2319,21 +2320,21 @@ LC RC OP OPERATOR OPT DESCRIPTION CARD
+>INTO '/user/trafodion/hive/exttables/unload_customer_name'
+>select c_first_name,c_last_name from trafodion.hbase.customer_salt;
Task: UNLOAD Status: Started
-Task: EMPTY TARGET Status: Started Time: 2017-05-01 18:53:25.364
-Task: EMPTY TARGET Status: Ended Time: 2017-05-01 18:53:25.366
-Task: EMPTY TARGET Status: Ended Elapsed Time: 00:00:00.002
-Task: CREATE SNAPSHO Status: Started Time: 2017-05-01 18:53:25.366
+Task: EMPTY TARGET Status: Started Time: 2017-08-15 15:02:58.169
+Task: EMPTY TARGET Status: Ended Time: 2017-08-15 15:02:58.257
+Task: EMPTY TARGET Status: Ended Elapsed Time: 00:00:00.009
+Task: CREATE SNAPSHO Status: Started Time: 2017-08-15 15:02:58.257
Snapshots created: 1
-Task: CREATE SNAPSHO Status: Ended Time: 2017-05-01 18:53:26.197
-Task: CREATE SNAPSHO Status: Ended Elapsed Time: 00:00:00.653
-Task: EXTRACT Status: Started Time: 2017-05-01 18:53:26.198
+Task: CREATE SNAPSHO Status: Ended Time: 2017-08-15 15:02:58.684
+Task: CREATE SNAPSHO Status: Ended Elapsed Time: 00:00:00.659
+Task: EXTRACT Status: Started Time: 2017-08-15 15:02:58.684
Rows Processed: 100000
-Task: EXTRACT Status: Ended Time: 2017-05-01 18:53:27.567
-Task: EXTRACT Status: Ended Elapsed Time: 00:00:01.548
-Task: DELETE SNAPSHO Status: Started Time: 2017-05-01 18:53:27.567
+Task: EXTRACT Status: Ended Time: 2017-08-15 15:03:00.257
+Task: EXTRACT Status: Ended Elapsed Time: 00:00:01.573
+Task: DELETE SNAPSHO Status: Started Time: 2017-08-15 15:03:00.257
Snapshots deleted: 1
-Task: DELETE SNAPSHO Status: Ended Time: 2017-05-01 18:53:27.576
-Task: DELETE SNAPSHO Status: Ended Elapsed Time: 00:00:00.009
+Task: DELETE SNAPSHO Status: Ended Time: 2017-08-15 15:03:00.286
+Task: DELETE SNAPSHO Status: Ended Elapsed Time: 00:00:00.029
--- 100000 row(s) unloaded.
>>--sh sleep 10;
@@ -2377,16 +2378,16 @@ C_FIRST_NAME
>>--unload 100 --should give error [8447]
>>unload into '//\a//c' select * from CUSTOMER_ADDRESS;
Task: UNLOAD Status: Started
-Task: EXTRACT Status: Started Time: 2017-05-01 18:53:31.145
+Task: EXTRACT Status: Started Time: 2017-08-15 15:03:02.997
*** ERROR[8447] An error occurred during hdfs access. Error Detail: Java exception in hdfsCreate(). java.io.IOException: No FileSystem for scheme: null
-org.apache.hadoop.fs.FileSystem.getFileSystemClass(FileSystem.java:2676)
-org.apache.hadoop.fs.FileSystem.createFileSystem(FileSystem.java:2690)
-org.apache.hadoop.fs.FileSystem.access$200(FileSystem.java:94)
-org.apache.hadoop.fs.FileSystem$Cache.getInternal(FileSystem.java:2733)
-org.apache.hadoop.fs.FileSystem$Cache.get(FileSystem.java:2715)
-org.apache.hadoop.fs.FileSystem.get(FileSystem.java:382)
-org.trafodion.sql.SequenceFileWriter.hdfsCreate(SequenceFileWriter.java:155)
+org.apache.hadoop.fs.FileSystem.getFileSystemClass(FileSystem.java:2584)
+org.apache.hadoop.fs.FileSystem.createFileSystem(FileSystem.java:2591)
+org.apache.hadoop.fs.FileSystem.access$200(FileSystem.java:91)
+org.apache.hadoop.fs.FileSystem$Cache.getInternal(FileSystem.java:2630)
+org.apache.hadoop.fs.FileSystem$Cache.get(FileSystem.java:2612)
+org.apache.hadoop.fs.FileSystem.get(FileSystem.java:370)
+org.trafodion.sql.SequenceFileWriter.hdfsCreate(SequenceFileWriter.java:156)
--- 0 row(s) unloaded.
>>
@@ -2411,10 +2412,10 @@ unload with delimiter 0 into '/user/trafodion/bulkload/test' select * from CUST
>>--unload 103 -- should not give an error
>>unload with delimiter '\a' into '/user/trafodion/bulkload/test' select * from customer_address;
Task: UNLOAD Status: Started
-Task: EXTRACT Status: Started Time: 2017-05-01 18:53:31.774
+Task: EXTRACT Status: Started Time: 2017-08-15 15:03:03.456
Rows Processed: 50000
-Task: EXTRACT Status: Ended Time: 2017-05-01 18:53:32.634
-Task: EXTRACT Status: Ended Elapsed Time: 00:00:00.860
+Task: EXTRACT Status: Ended Time: 2017-08-15 15:03:04.542
+Task: EXTRACT Status: Ended Elapsed Time: 00:00:01.086
--- 50000 row(s) unloaded.
>>--unload 24 -- should give an error
[17/32] trafodion git commit: [TRAFODION-2704]reslove the random
schema not exist issue
Posted by li...@apache.org.
[TRAFODION-2704]reslove the random schema not exist issue
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/1ade4208
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/1ade4208
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/1ade4208
Branch: refs/heads/master
Commit: 1ade4208f1e3551fa4ce2c7cbfda29a4c8c68b15
Parents: 835a489
Author: Weiqing Xu <we...@esgyn.cn>
Authored: Sat Sep 23 17:48:39 2017 +0000
Committer: Weiqing Xu <we...@esgyn.cn>
Committed: Sun Sep 24 03:43:10 2017 +0000
----------------------------------------------------------------------
.../org/trafodion/jdbc/t4/T4DriverTest.java | 28 -------------
.../java/org/trafodion/jdbc_test/PropTest.java | 9 +++-
.../java/org/trafodion/jdbc_test/TestBlob.java | 16 +++++---
.../org/trafodion/jdbc_test/TestBlobBatch.java | 12 ++++--
.../java/org/trafodion/jdbc_test/TestClob.java | 17 ++++++--
.../org/trafodion/jdbc_test/TestClobBatch.java | 15 ++++---
.../org/trafodion/jdbc_test/TestForeignKey.java | 43 ++++++++++----------
.../trafodion/jdbc_test/TestGetIndexInfo.java | 24 +++++++----
8 files changed, 88 insertions(+), 76 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/1ade4208/core/conn/jdbcT4/src/test/java/org/trafodion/jdbc/t4/T4DriverTest.java
----------------------------------------------------------------------
diff --git a/core/conn/jdbcT4/src/test/java/org/trafodion/jdbc/t4/T4DriverTest.java b/core/conn/jdbcT4/src/test/java/org/trafodion/jdbc/t4/T4DriverTest.java
index e158e7b..e44c97a 100644
--- a/core/conn/jdbcT4/src/test/java/org/trafodion/jdbc/t4/T4DriverTest.java
+++ b/core/conn/jdbcT4/src/test/java/org/trafodion/jdbc/t4/T4DriverTest.java
@@ -23,12 +23,7 @@
package org.trafodion.jdbc.t4;
-import java.sql.Blob;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.ResultSet;
import java.sql.SQLException;
-import java.sql.Statement;
import org.junit.Assert;
import org.junit.BeforeClass;
@@ -44,29 +39,6 @@ public class T4DriverTest {
@Test
- public void readLob() throws SQLException {
- Connection conn = null;
- try {
- conn = DriverManager.getConnection("jdbc:t4jdbc://192.168.0.36:23400/:", "zz", "zz");
- Statement stmt = conn.createStatement();
- ResultSet rs = stmt.executeQuery("select c2 from tlob");
- while (rs.next()) {
- Blob blob = rs.getBlob(1);
- System.out.println("LOB length " + blob.length());
- System.out.println(new String(blob.getBytes(1, (int)blob.length())));
- }
- conn.close();
- conn = null;
- }
- catch (SQLException se) {
- System.out.println(se.getMessage());
- }
- finally {
- if (conn != null)
- conn.close();
- }
- }
- @Test
public void acceptsURL() throws SQLException {
String url = "jdbc:t4jdbc://localhost:23400/:";
Assert.assertTrue(driver.acceptsURL(url));
http://git-wip-us.apache.org/repos/asf/trafodion/blob/1ade4208/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/PropTest.java
----------------------------------------------------------------------
diff --git a/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/PropTest.java b/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/PropTest.java
index a4a269e..47bd5ca 100644
--- a/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/PropTest.java
+++ b/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/PropTest.java
@@ -41,6 +41,7 @@ import java.io.*;
import org.junit.Test;
import static org.junit.Assert.*;
+import static org.junit.Assert.fail;
/* The test case is added for bug #1452993;
* T2 don't read the property file from System Properties but T4 do it.
@@ -54,10 +55,14 @@ public class PropTest
public void testDefaultPropertiesConnection() throws SQLException {
Connection conn = null;
try {
+ conn = Utils.getUserConnection();
+ }
+ catch (Exception e) {
+ fail("failed to create connection" + e.getMessage());
+ }
+ try {
// The option -Dproperties=propFile can be used to instead of System.setProperty()
System.setProperty("properties", System.getProperty("trafjdbc.properties"));
-
- conn = DriverManager.getConnection(Utils.url, Utils.usr, Utils.pwd);
System.out.println("Catalog : " + conn.getCatalog());
assertEquals("Catalog should be the same as the properties file defined",Utils.catalog, conn.getCatalog());
System.out.println("testDefaultPropertiesConnection : PASS");
http://git-wip-us.apache.org/repos/asf/trafodion/blob/1ade4208/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestBlob.java
----------------------------------------------------------------------
diff --git a/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestBlob.java b/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestBlob.java
index ff7c398..283555c 100644
--- a/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestBlob.java
+++ b/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestBlob.java
@@ -22,6 +22,7 @@
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.io.InputStream;
import java.io.OutputStream;
@@ -38,7 +39,8 @@ import org.junit.Test;
public class TestBlob {
private static final String tableName = "BLOBTEST";
- private static final String strCreateTable = "CREATE TABLE " + Utils.schema + "." + tableName + "(C1 int, c2 BLOB);";
+ private static final String strCreateTable = "CREATE TABLE if not exists " + Utils.schema + "." + tableName
+ + "(C1 int, c2 BLOB);";
private static final String strDropTable = "DROP TABLE " + Utils.schema + "." + tableName;
private static Connection _conn = null;
@@ -46,15 +48,19 @@ public class TestBlob {
@BeforeClass
public static void doTestSuiteSetup() throws Exception {
try {
- _conn = DriverManager.getConnection(Utils.url, Utils.usr, Utils.pwd);
+ _conn = Utils.getUserConnection();
+ }
+ catch (Exception e) {
+ fail("failed to create connection" + e.getMessage());
+ }
+ try (
Statement stmt = _conn.createStatement();
-
+ ) {
// use CQD to enable BLOB support
stmt.execute("CQD TRAF_BLOB_AS_VARCHAR 'OFF'");
stmt.execute(strCreateTable);
} catch (Exception e) {
- System.out.println(e.getMessage());
- e.printStackTrace();
+ fail("failed to set CQDs for Blob : " + e.getMessage());
}
}
http://git-wip-us.apache.org/repos/asf/trafodion/blob/1ade4208/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestBlobBatch.java
----------------------------------------------------------------------
diff --git a/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestBlobBatch.java b/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestBlobBatch.java
index b3acb5e..ee7f44c 100644
--- a/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestBlobBatch.java
+++ b/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestBlobBatch.java
@@ -23,6 +23,7 @@ import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
@@ -165,15 +166,18 @@ public class TestBlobBatch {
@BeforeClass
public static void doTestSuiteSetup() throws Exception {
try {
- _conn = DriverManager.getConnection(Utils.url, Utils.usr, Utils.pwd);
+ _conn = Utils.getUserConnection();
+ } catch (Exception e) {
+ fail("failed to create connection" + e.getMessage());
+ }
+ try (
Statement stmt = _conn.createStatement();
-
+ ) {
// use CQD to enable BLOB support
stmt.execute("CQD TRAF_BLOB_AS_VARCHAR 'OFF'");
stmt.execute(strCreateTable);
} catch (Exception e) {
- System.out.println(e.getMessage());
- e.printStackTrace();
+ fail("failed to set CQD : " + e.getMessage());
}
}
http://git-wip-us.apache.org/repos/asf/trafodion/blob/1ade4208/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestClob.java
----------------------------------------------------------------------
diff --git a/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestClob.java b/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestClob.java
index 51a7cf5..1919c53 100644
--- a/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestClob.java
+++ b/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestClob.java
@@ -23,6 +23,7 @@ import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.io.IOException;
import java.io.InputStream;
@@ -51,10 +52,17 @@ public class TestClob {
@BeforeClass
public static void doTestSuiteSetup() throws Exception {
- try {
- _conn = DriverManager.getConnection(Utils.url, Utils.usr, Utils.pwd);
- Statement stmt = _conn.createStatement();
-
+ try {
+ _conn = Utils.getUserConnection();
+ }
+ catch (SQLException se) {
+ se.printStackTrace();
+ fail("failed to create connection : " + se.getMessage());
+ }
+ try (
+ Statement stmt = _conn.createStatement();
+ )
+ {
// use CQD to enable CLOB support
stmt.execute("CQD TRAF_CLOB_AS_VARCHAR 'OFF'");
// stmt.execute(strDropTable);
@@ -62,6 +70,7 @@ public class TestClob {
} catch (Exception e) {
System.out.println(e.getMessage());
e.printStackTrace();
+ fail("failed to set CQD for CLOB");
}
}
http://git-wip-us.apache.org/repos/asf/trafodion/blob/1ade4208/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestClobBatch.java
----------------------------------------------------------------------
diff --git a/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestClobBatch.java b/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestClobBatch.java
index d729dbe..b5ea1d0 100644
--- a/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestClobBatch.java
+++ b/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestClobBatch.java
@@ -22,6 +22,7 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.io.Reader;
import java.io.StringReader;
@@ -200,16 +201,20 @@ public class TestClobBatch {
@BeforeClass
public static void doTestSuiteSetup() throws Exception {
- try {
- _conn = DriverManager.getConnection(Utils.url, Utils.usr, Utils.pwd);
- Statement stmt = _conn.createStatement();
+ try {
+ _conn = Utils.getUserConnection();
+ } catch (Exception e) {
+ fail("failed to create connection" + e.getMessage());
+ }
+ try (
+ Statement stmt = _conn.createStatement();
+ ) {
// use CQD to enable BLOB support
stmt.execute("CQD TRAF_CLOB_AS_VARCHAR 'OFF'");
stmt.execute(strCreateTable);
} catch (Exception e) {
- System.out.println(e.getMessage());
- e.printStackTrace();
+ fail("failed to set CQD : " + e.getMessage());
}
}
http://git-wip-us.apache.org/repos/asf/trafodion/blob/1ade4208/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestForeignKey.java
----------------------------------------------------------------------
diff --git a/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestForeignKey.java b/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestForeignKey.java
index 9c87e9e..90c19c4 100644
--- a/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestForeignKey.java
+++ b/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestForeignKey.java
@@ -26,8 +26,6 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.Statement;
-import javax.swing.text.Utilities;
-
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -46,22 +44,26 @@ public class TestForeignKey {
private static final String FK21 = "FK21";
private static final String FK22 = "FK22";
- private static final String strCreatePKTABLE1Query = "CREATE TABLE " + Utils.schema + "." + PKTABLE1 + "( "
+ private static final String strCreatePKTABLE1Query = "CREATE TABLE IF NOT EXISTS " + Utils.schema + "." + PKTABLE1
+ + "( "
+ PK1 + " INT NOT NULL PRIMARY KEY)";
private static final String strDropPKTABLE1Query = "DROP TABLE " + Utils.schema + "." + PKTABLE1;
- private static final String strCreatePKTABLE2Query = "CREATE TABLE " + Utils.schema + "." + PKTABLE2 + "( "
+ private static final String strCreatePKTABLE2Query = "CREATE TABLE IF NOT EXISTS " + Utils.schema + "." + PKTABLE2
+ + "( "
+ PK2 + " INT NOT NULL PRIMARY KEY)";
private static final String strDropPKTABLE2Query = "DROP TABLE " + Utils.schema + "." + PKTABLE2;
- private static final String strCreateFKTABLE1Query = "CREATE TABLE " + Utils.schema + "." + FKTABLE1 + "( "
+ private static final String strCreateFKTABLE1Query = "CREATE TABLE IF NOT EXISTS " + Utils.schema + "." + FKTABLE1
+ + "( "
+ FK1 + " INT NOT NULL, "
+ FK2 + " INT NOT NULL, "
+ "FOREIGN KEY (" + FK1 + ") REFERENCES " + Utils.schema + "." + PKTABLE1 + "(" + PK1 + "), "
+ "FOREIGN KEY (" + FK2 + ") REFERENCES " + Utils.schema + "." + PKTABLE2 + "(" + PK2 + "))";
private static final String strDropFKTABLE1Query = "DROP TABLE " + Utils.schema + "." + FKTABLE1;
- private static final String strCreateFKTABLE2Query = "CREATE TABLE " + Utils.schema + "." + FKTABLE2 + "( "
+ private static final String strCreateFKTABLE2Query = "CREATE TABLE IF NOT EXISTS " + Utils.schema + "." + FKTABLE2
+ + "( "
+ FK21 + " INT NOT NULL, "
+ FK22 + " INT NOT NULL, "
+ "FOREIGN KEY (" + FK21 + ") REFERENCES " + Utils.schema + "." + PKTABLE1 + "(" + PK1 + "), "
@@ -69,24 +71,23 @@ public class TestForeignKey {
private static final String strDropFKTABLE2Query = "DROP TABLE " + Utils.schema + "." + FKTABLE2;
private static Connection _conn;
-
+
@BeforeClass
public static void doTestSuiteSetup() throws Exception {
- try{
- _conn = DriverManager.getConnection(Utils.url, Utils.usr, Utils.pwd);
- try (
- Statement stmt = _conn.createStatement();
- )
- {
- stmt.execute(strCreatePKTABLE1Query);
- stmt.execute(strCreatePKTABLE2Query);
- stmt.execute(strCreateFKTABLE1Query);
- stmt.execute(strCreateFKTABLE2Query);
- }
- }
+ try {
+ _conn = Utils.getUserConnection();
+ } catch (Exception e) {
+ fail("failed to create connection" + e.getMessage());
+ }
+
+ try (Statement stmt = _conn.createStatement();) {
+ stmt.execute(strCreatePKTABLE1Query);
+ stmt.execute(strCreatePKTABLE2Query);
+ stmt.execute(strCreateFKTABLE1Query);
+ stmt.execute(strCreateFKTABLE2Query);
+ }
catch (Exception e) {
- System.out.println(e.getMessage());
- e.printStackTrace();
+ fail("failed to create table: " + e.getMessage());
}
}
http://git-wip-us.apache.org/repos/asf/trafodion/blob/1ade4208/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestGetIndexInfo.java
----------------------------------------------------------------------
diff --git a/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestGetIndexInfo.java b/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestGetIndexInfo.java
index 1cab0b0..9789ced 100644
--- a/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestGetIndexInfo.java
+++ b/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestGetIndexInfo.java
@@ -47,12 +47,23 @@ public class TestGetIndexInfo {
@BeforeClass
public static void doTestSuiteSetup() throws Exception {
- try {
- _conn = DriverManager.getConnection(Utils.url, Utils.usr, Utils.pwd);
+ try {
+ _conn = Utils.getUserConnection();
+ } catch (Exception e) {
+ fail("failed to create connection" + e.getMessage());
+ }
+
+ try (Statement stmt = _conn.createStatement()
+ ) {
+ stmt.execute(strCreateTableQuery);
+ }
+ catch (Exception e) {
+ fail("failed to create the table : " + e.getMessage());
+ }
+ try (
Statement stmt = _conn.createStatement();
- stmt.execute(strCreateTableQuery);
-
- PreparedStatement pstmt = _conn.prepareStatement(strInsertQuery);
+ PreparedStatement pstmt = _conn.prepareStatement(strInsertQuery);
+ ) {
int[][] testValues = {
{1, 2},
{10, 3},
@@ -65,8 +76,7 @@ public class TestGetIndexInfo {
pstmt.addBatch();
}
pstmt.executeBatch();
- pstmt.close();
-
+
// create index
stmt.execute(strCreateIndexQuery);
[18/32] trafodion git commit: Merge remote branch
'origin/pr/1240/head' into merge_1240
Posted by li...@apache.org.
Merge remote branch 'origin/pr/1240/head' into merge_1240
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/e26ec04a
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/e26ec04a
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/e26ec04a
Branch: refs/heads/master
Commit: e26ec04a7815cb46f3d10d9816398c10ad13df67
Parents: 42b2b0b 1ade420
Author: Sandhya Sundaresan <sa...@apache.org>
Authored: Mon Sep 25 04:32:50 2017 +0000
Committer: Sandhya Sundaresan <sa...@apache.org>
Committed: Mon Sep 25 04:32:50 2017 +0000
----------------------------------------------------------------------
.../trafodion/jdbc/t4/ExtractLobMessage.java | 13 +--
.../org/trafodion/jdbc/t4/ExtractLobReply.java | 23 +++--
.../org/trafodion/jdbc/t4/T4Properties.java | 28 +++++-
.../java/org/trafodion/jdbc/t4/TrafT4Blob.java | 11 ---
.../java/org/trafodion/jdbc/t4/TrafT4Clob.java | 13 ---
.../java/org/trafodion/jdbc/t4/TrafT4Lob.java | 39 ++++++--
.../nsksrvr/Interface/marshalingsrvr_srvr.cpp | 48 +++++++---
.../nsksrvr/Interface/marshalingsrvr_srvr.h | 6 +-
.../src/odbc/nsksrvr/Interface/odbcs_srvr.cpp | 11 ++-
.../odbc/nsksrvr/Interface/odbcs_srvr_res.cpp | 18 ++--
.../src/odbc/nsksrvr/Interface/odbcs_srvr_res.h | 6 +-
core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.cpp | 20 +++--
core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.h | 3 +-
.../conn/odbc/src/odbc/nsksrvrcore/srvrcommon.h | 5 +-
.../odbc/src/odbc/nsksrvrcore/srvrothers.cpp | 94 +++++++-------------
.../org/trafodion/jdbc_test/JdbcCommon.java | 27 ++++--
.../java/org/trafodion/jdbc_test/PropTest.java | 9 +-
.../java/org/trafodion/jdbc_test/TestBlob.java | 16 ++--
.../org/trafodion/jdbc_test/TestBlobBatch.java | 12 ++-
.../java/org/trafodion/jdbc_test/TestClob.java | 17 +++-
.../org/trafodion/jdbc_test/TestClobBatch.java | 15 ++--
.../org/trafodion/jdbc_test/TestForeignKey.java | 87 +++++++++++-------
.../trafodion/jdbc_test/TestGetIndexInfo.java | 24 +++--
23 files changed, 335 insertions(+), 210 deletions(-)
----------------------------------------------------------------------
[10/32] trafodion git commit: Merge remote branch
'origin/pr/1216/head' into merge_1216
Posted by li...@apache.org.
Merge remote branch 'origin/pr/1216/head' into merge_1216
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/615b8dd2
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/615b8dd2
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/615b8dd2
Branch: refs/heads/master
Commit: 615b8dd26d38e19ba17cf9451453bc38e8879dcc
Parents: 2048d25 f186448
Author: Sandhya Sundaresan <sa...@apache.org>
Authored: Mon Sep 4 06:58:05 2017 +0000
Committer: Sandhya Sundaresan <sa...@apache.org>
Committed: Mon Sep 4 06:58:05 2017 +0000
----------------------------------------------------------------------
core/sql/cli/Cli.cpp | 5 +-
core/sql/clitest/blobtest.cpp | 12 +-
core/sql/executor/ExExeUtil.h | 7 +-
core/sql/executor/ExExeUtilLoad.cpp | 255 ++++++++-----
core/sql/exp/ExpLOBaccess.cpp | 135 +++++--
core/sql/exp/ExpLOBaccess.h | 4 +-
core/sql/exp/ExpLOBenums.h | 4 +-
core/sql/exp/ExpLOBinterface.cpp | 57 ++-
core/sql/exp/ExpLOBinterface.h | 13 +
core/sql/generator/GenRelExeUtil.cpp | 2 +-
core/sql/regress/executor/EXPECTED130 | 78 ++--
core/sql/regress/hive/EXPECTED018 | 585 +++++++++++++++--------------
12 files changed, 688 insertions(+), 469 deletions(-)
----------------------------------------------------------------------
[25/32] trafodion git commit: pyinstaller fix - kerberos related
issues while executing hdfs commands
Posted by li...@apache.org.
pyinstaller fix - kerberos related issues while executing hdfs commands
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/2a6282c1
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/2a6282c1
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/2a6282c1
Branch: refs/heads/master
Commit: 2a6282c16989ab5cb6d2806b568989e3f567398c
Parents: 5be0d2e
Author: Eason <hf...@gmail.com>
Authored: Tue Jan 30 16:00:29 2018 +0800
Committer: Eason <hf...@gmail.com>
Committed: Tue Jan 30 16:00:29 2018 +0800
----------------------------------------------------------------------
install/python-installer/scripts/hdfs_cmds.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/2a6282c1/install/python-installer/scripts/hdfs_cmds.py
----------------------------------------------------------------------
diff --git a/install/python-installer/scripts/hdfs_cmds.py b/install/python-installer/scripts/hdfs_cmds.py
index 12d342c..df39d94 100755
--- a/install/python-installer/scripts/hdfs_cmds.py
+++ b/install/python-installer/scripts/hdfs_cmds.py
@@ -45,7 +45,7 @@ def run():
traf_user = dbcfgs['traf_user']
hdfs_user = dbcfgs['hdfs_user']
hbase_user = dbcfgs['hbase_user']
- hbase_group = cmd_output('%s groups %s | cut -d" " -f3' % (hdfs_bin, hbase_user))
+ hbase_group = run_cmd_as_user(hdfs_user, '%s groups %s | cut -d" " -f3' % (hdfs_bin, hbase_user))
run_cmd_as_user(hdfs_user, '%s dfsadmin -safemode wait' % hdfs_bin)
run_cmd_as_user(hdfs_user, '%s dfs -mkdir -p %s/{trafodion_backups,bulkload,lobs} /hbase/archive' % (hdfs_bin, traf_loc))
[07/32] trafodion git commit: Merge Fix for Cherry-pick changes of
[TRAFODION-2703] & [TRAFODION-2710] to 2.2
Posted by li...@apache.org.
Merge Fix for Cherry-pick changes of [TRAFODION-2703] & [TRAFODION-2710] to 2.2
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/2048d253
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/2048d253
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/2048d253
Branch: refs/heads/master
Commit: 2048d253ca0ec8e01bf9f8b2c959a67f82da530a
Parents: d538162 fb007c0
Author: Liu Ming <ov...@sina.com>
Authored: Thu Aug 24 03:09:27 2017 +0000
Committer: Liu Ming <ov...@sina.com>
Committed: Thu Aug 24 03:09:27 2017 +0000
----------------------------------------------------------------------
docs/odb_user/src/asciidoc/_chapters/load.adoc | 95 +++++++++++++++-----
.../sql_functions_and_expressions.adoc | 24 ++---
.../src/asciidoc/_chapters/sql_statements.adoc | 62 +++++++++++--
3 files changed, 140 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
[31/32] trafodion git commit: Merge remote branch 'origin/release2.2'
into TRAFODION-3014
Posted by li...@apache.org.
Merge remote branch 'origin/release2.2' into TRAFODION-3014
Conflicts:
core/sql/cli/Cli.cpp
core/sql/clitest/blobtest.cpp
core/sql/executor/ExExeUtilLoad.cpp
core/sql/exp/ExpLOBaccess.cpp
core/sql/exp/ExpLOBaccess.h
core/sql/exp/ExpLOBenums.h
core/sql/exp/ExpLOBinterface.cpp
core/sql/exp/ExpLOBinterface.h
core/sql/generator/GenRelExeUtil.cpp
core/sql/regress/executor/EXPECTED130
core/sql/regress/hive/EXPECTED018
docs/sql_reference/src/asciidoc/_chapters/sql_statements.adoc
install/python-installer/scripts/traf_ldap.py
pom.xml
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/c75c6bfa
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/c75c6bfa
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/c75c6bfa
Branch: refs/heads/master
Commit: c75c6bfa45fb2c8f2d2e7406522f83aef20ee786
Parents: 7430ca8 b460106
Author: Liu Ming <ov...@sina.com>
Authored: Tue Mar 27 19:56:23 2018 -0400
Committer: Liu Ming <ov...@sina.com>
Committed: Tue Mar 27 19:56:23 2018 -0400
----------------------------------------------------------------------
NOTICE | 2 +-
.../trafodion/jdbc/t4/ExtractLobMessage.java | 13 +--
.../org/trafodion/jdbc/t4/ExtractLobReply.java | 23 +++--
.../org/trafodion/jdbc/t4/T4Properties.java | 48 +++++++++-
.../java/org/trafodion/jdbc/t4/TrafT4Blob.java | 11 ---
.../java/org/trafodion/jdbc/t4/TrafT4Clob.java | 13 ---
.../java/org/trafodion/jdbc/t4/TrafT4Lob.java | 39 ++++++--
.../org/trafodion/jdbc/t4/TrafT4ResultSet.java | 8 +-
.../nsksrvr/Interface/marshalingsrvr_srvr.cpp | 48 +++++++---
.../nsksrvr/Interface/marshalingsrvr_srvr.h | 6 +-
.../src/odbc/nsksrvr/Interface/odbcs_srvr.cpp | 11 ++-
.../odbc/nsksrvr/Interface/odbcs_srvr_res.cpp | 18 ++--
.../src/odbc/nsksrvr/Interface/odbcs_srvr_res.h | 6 +-
core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.cpp | 20 +++--
core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.h | 3 +-
.../conn/odbc/src/odbc/nsksrvrcore/srvrcommon.h | 5 +-
.../odbc/src/odbc/nsksrvrcore/srvrothers.cpp | 94 +++++++-------------
.../java/org/trafodion/ci/SessionInterface.java | 2 +
core/sql/executor/ExExeUtilLoad.cpp | 1 -
core/sql/exp/ExpLOBaccess.cpp | 1 +
core/sql/exp/ExpLOBinterface.cpp | 2 -
.../org/trafodion/jdbc_test/JdbcCommon.java | 27 ++++--
.../java/org/trafodion/jdbc_test/PropTest.java | 9 +-
.../java/org/trafodion/jdbc_test/TestBlob.java | 16 ++--
.../org/trafodion/jdbc_test/TestBlobBatch.java | 12 ++-
.../java/org/trafodion/jdbc_test/TestClob.java | 17 +++-
.../org/trafodion/jdbc_test/TestClobBatch.java | 15 ++--
.../org/trafodion/jdbc_test/TestForeignKey.java | 87 +++++++++++-------
.../trafodion/jdbc_test/TestGetIndexInfo.java | 24 +++--
install/python-installer/scripts/hdfs_cmds.py | 2 +-
30 files changed, 364 insertions(+), 219 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/c75c6bfa/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/T4Properties.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/c75c6bfa/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4ResultSet.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/c75c6bfa/core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.cpp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/c75c6bfa/core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.h
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/c75c6bfa/core/conn/odbc/src/odbc/nsksrvrcore/srvrcommon.h
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/c75c6bfa/core/conn/odbc/src/odbc/nsksrvrcore/srvrothers.cpp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/c75c6bfa/core/conn/trafci/src/main/java/org/trafodion/ci/SessionInterface.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/c75c6bfa/core/sql/executor/ExExeUtilLoad.cpp
----------------------------------------------------------------------
diff --cc core/sql/executor/ExExeUtilLoad.cpp
index fca307c,614adde..fbebeaa
--- a/core/sql/executor/ExExeUtilLoad.cpp
+++ b/core/sql/executor/ExExeUtilLoad.cpp
@@@ -2752,9 -2779,8 +2752,8 @@@ void ExExeUtilLobExtractTcb::freeResour
3, // close
0); // open type not applicable
-
- NADELETE(lobGlobals_,LOBglobals,currContext->exHeap());
- lobGlobals_ = NULL;
+ ExpLOBinterfaceCleanup(exLobGlobals_);
+ exLobGlobals_ = NULL;
}
ExExeUtilLobExtractTcb::~ExExeUtilLobExtractTcb()
http://git-wip-us.apache.org/repos/asf/trafodion/blob/c75c6bfa/core/sql/exp/ExpLOBaccess.cpp
----------------------------------------------------------------------
diff --cc core/sql/exp/ExpLOBaccess.cpp
index 4b3a785,af2846c..819394b
--- a/core/sql/exp/ExpLOBaccess.cpp
+++ b/core/sql/exp/ExpLOBaccess.cpp
@@@ -786,66 -853,6 +786,67 @@@ Ex_Lob_Error ExLob::getLength(char *han
}
return err;
}
++
+Ex_Lob_Error ExLob::getOffset(char *handleIn, Int32 handleInLen,Int64 &outLobOffset,LobsSubOper so, Int64 transId)
+{
+ char logBuf[4096];
+ Int32 cliErr = 0;
+ Ex_Lob_Error err=LOB_OPER_OK;
+
+ Int64 dummy = 0;
+ Int32 dummy2 = 0;
+ if (so != Lob_External_File)
+ {
+
+ cliErr = SQL_EXEC_LOBcliInterface(handleIn, handleInLen,NULL,NULL,NULL,NULL,LOB_CLI_SELECT_LOBOFFSET,LOB_CLI_ExecImmed,&outLobOffset,0, 0, 0,0,transId,lobTrace_);
+
+ if (cliErr < 0 ) {
+ str_sprintf(logBuf,"CLI SELECT_LOBOFFSET returned error %d",cliErr);
+ lobDebugInfo(logBuf, 0,__LINE__,lobTrace_);
+
+ return LOB_DESC_READ_ERROR;
+ }
+ }
+
+ return err;
+}
+
+Ex_Lob_Error ExLob::getFileName(char *handleIn, Int32 handleInLen, char *outFileName, Int32 &outFileLen , LobsSubOper so, Int64 transId)
+{
+ char logBuf[4096];
+ Int32 cliErr = 0;
+ Ex_Lob_Error err=LOB_OPER_OK;
+ Int64 dummy = 0;
+ Int32 dummy2 = 0;
+ if (so != Lob_External_File)
+ {
+ //Derive the filename from the LOB handle and return
+ str_cpy_all(outFileName, (char *)lobDataFile_.data(),lobDataFile_.length());
+ }
+ else
+ {
+ //Get the lob external filename from the descriptor file
+ cliErr = SQL_EXEC_LOBcliInterface(handleIn,
+ handleInLen,
+ (char *)outFileName, &outFileLen,
+ NULL, 0,
+ LOB_CLI_SELECT_UNIQUE, LOB_CLI_ExecImmed,
+ &dummy, &dummy,
+ &dummy, &dummy,
+ 0,
+ transId,lobTrace_);
+ if (cliErr < 0 ) {
+ str_sprintf(logBuf,"CLI SELECT_FILENAME returned error %d",cliErr);
+ lobDebugInfo(logBuf, 0,__LINE__,lobTrace_);
+
+ return LOB_DESC_READ_ERROR;
+ }
+
+ }
+ return err;
+}
+
+
Ex_Lob_Error ExLob::writeDesc(Int64 &sourceLen, char *source, LobsSubOper subOper, Int64 &descNumOut, Int64 &operLen, Int64 lobMaxSize,Int64 lobMaxChunkMemSize,Int64 lobGCLimit, char * handleIn, Int32 handleInLen, char *blackBox, Int32 *blackBoxLen, char *handleOut, Int32 &handleOutLen, Int64 xnId, void *lobGlobals)
{
Ex_Lob_Error err=LOB_OPER_OK;
http://git-wip-us.apache.org/repos/asf/trafodion/blob/c75c6bfa/core/sql/exp/ExpLOBinterface.cpp
----------------------------------------------------------------------
diff --cc core/sql/exp/ExpLOBinterface.cpp
index 8e73864,9b58344..a79381a
--- a/core/sql/exp/ExpLOBinterface.cpp
+++ b/core/sql/exp/ExpLOBinterface.cpp
@@@ -985,7 -984,7 +985,6 @@@ Lng32 ExpLOBInterfaceSelectCursor(ExLob
0,
hdfsDetailError,0,0,0,0,0,0,0,
openType
--
);
if (err != LOB_OPER_OK)
@@@ -1050,123 -1049,8 +1049,122 @@@ Lng32 ExpLOBInterfaceGetLobLength(ExLob
return LOB_ACCESS_SUCCESS;
}
+
+Lng32 ExpLOBInterfaceGetOffset(ExLobGlobals * exLobGlob,
+ char * lobName,
+ char * lobLoc,
+ Lng32 lobType,
+ char * lobHdfsServer,
+ Lng32 lobHdfsPort,
+ Int32 handleLen,
+ char * lobHandle,
+ Int64 &outLobOffset
+
+ )
+{
+ Ex_Lob_Error err;
+
+ Int64 dummyParam = 0;
+ Int32 dummyParam2 = 0;
+ Ex_Lob_Error status;
+ Int64 cliError=0;
+
+ LobsOper lo;
+ LobsSubOper so;
+ LobsStorage ls = (LobsStorage)lobType;
+ if (ls == Lob_External_HDFS_File)
+ {
+ so = Lob_External_File;
+ outLobOffset = 0;
+ return LOB_ACCESS_SUCCESS;
+ }
+ else
+ so = Lob_Buffer;
+ err = ExLobsOper(lobName,
+ lobHandle, handleLen,
+ lobHdfsServer, lobHdfsPort,
+ NULL, dummyParam2,
+ dummyParam, dummyParam,
+ outLobOffset,
+ dummyParam, dummyParam,
+ status, cliError,
+ lobLoc, ls, //Lob_HDFS_File,
+ NULL, 0,
+ dummyParam,NULL,
+ Lob_GetOffset,
+ so,
+ TRUE,
+ exLobGlob,
+ 0,
+ 0, 0,0,0,0,0,0,0,
+ 0
+ );
+
+ if (err != LOB_OPER_OK)
+ {
+ return -err;
+ }
+
+ return LOB_ACCESS_SUCCESS;
+}
+
+Lng32 ExpLOBInterfaceGetFileName(ExLobGlobals * exLobGlob,
+ char * lobName,
+ char * lobLoc,
+ Lng32 lobType,
+ char * lobHdfsServer,
+ Lng32 lobHdfsPort,
+ Int32 handleLen,
+ char * lobHandle,
+ char * fileName,
+ Int32 &outFileLen
+
+ )
+{
+ Ex_Lob_Error err;
+
+ Int64 dummyParam = 0;
+ Int32 dummyParam2 = 0;
+ Ex_Lob_Error status;
+ Int64 cliError=0;
+ Int64 hdfsFileLen = 0;
+ LobsOper lo;
+ LobsSubOper so;
+ LobsStorage ls = (LobsStorage)lobType;
+ if (ls == Lob_External_HDFS_File)
+ so = Lob_External_File;
+ else
+ so = Lob_Buffer;
+ err = ExLobsOper(lobName,
+ lobHandle, handleLen,
+ lobHdfsServer, lobHdfsPort,
+ NULL, dummyParam2,
+ dummyParam, dummyParam,
+ dummyParam,
+ dummyParam, dummyParam,
+ status, cliError,
+ lobLoc, ls, //Lob_HDFS_File,
+ NULL, 0,
+ dummyParam,NULL,
+ Lob_GetFileName,
+ so,
+ TRUE,
+ exLobGlob,
+ 0,
+ fileName, outFileLen,
+ 0,0,0,0,0,0,
+ 0
+ );
+
+ if (err != LOB_OPER_OK)
+ {
+ return -err;
+ }
+
-
+ return LOB_ACCESS_SUCCESS;
+}
Lng32 ExpLOBinterfaceStats(
- void * exLobGlob,
+ ExLobGlobals * exLobGlob,
ExLobStats * lobStats,
char * lobName, char * lobLoc,
Lng32 lobType,
http://git-wip-us.apache.org/repos/asf/trafodion/blob/c75c6bfa/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/PropTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/c75c6bfa/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestGetIndexInfo.java
----------------------------------------------------------------------
[22/32] trafodion git commit: [TRAFODION-2857] Adding repo and email
address name changes.
Posted by li...@apache.org.
[TRAFODION-2857] Adding repo and email address name changes.
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/6047c512
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/6047c512
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/6047c512
Branch: refs/heads/master
Commit: 6047c512707f72fd32f4b6e7e91bd3834c272b10
Parents: f077620
Author: Steve Varnau <st...@esgyn.com>
Authored: Fri Dec 29 19:03:25 2017 +0000
Committer: Steve Varnau <st...@esgyn.com>
Committed: Thu Jan 11 18:17:20 2018 +0000
----------------------------------------------------------------------
DISCLAIMER | 13 +-----
README | 4 +-
README.md | 4 +-
core/sqf/sql/scripts/install_apache_hadoop | 4 +-
core/sql/exp/exp_conv.cpp | 2 +-
docs/client_install/pom.xml | 10 ++---
docs/command_interface/pom.xml | 10 ++---
docs/cqd_reference/pom.xml | 10 ++---
docs/jdbct4ref_guide/pom.xml | 10 ++---
docs/load_transform/pom.xml | 10 ++---
docs/messages_guide/pom.xml | 10 ++---
docs/odb_user/pom.xml | 10 ++---
docs/provisioning_guide/pom.xml | 10 ++---
docs/spj_guide/pom.xml | 10 ++---
docs/sql_reference/pom.xml | 10 ++---
docs/src/site/markdown/download.md | 2 +-
.../site/markdown/enable-secure-trafodion.md | 2 +-
docs/src/site/markdown/quickstart.md | 2 +-
docs/src/site/markdown/release-notes-1-0-1.md | 2 +-
pom.xml | 44 ++++++++++----------
tools/docker/Dockerfile | 2 +-
tools/docker/start-compile-docker.sh | 6 +--
22 files changed, 88 insertions(+), 99 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/6047c512/DISCLAIMER
----------------------------------------------------------------------
diff --git a/DISCLAIMER b/DISCLAIMER
index 7f1f194..9fd36df 100644
--- a/DISCLAIMER
+++ b/DISCLAIMER
@@ -1,12 +1 @@
-Apache Trafodion is an effort undergoing incubation at The Apache Software
-Foundation (ASF), sponsored by the Apache Incubator PMC. Incubation is
-required of all newly accepted projects until a further review indicates that
-the infrastructure, communications, and decision making process have stabilized
-in a manner consistent with other successful ASF projects. While incubation
-status is not necessarily a reflection of the completeness or stability of the
-code, it does indicate that the project has yet to be fully endorsed by the ASF.
-
-For more information about the incubation status of the Apache Trafodion see:
- http://incubator.apache.org/projects/trafodion.html
-
-
+*** File To Be Removed - still referenced in packaging ***
http://git-wip-us.apache.org/repos/asf/trafodion/blob/6047c512/README
----------------------------------------------------------------------
diff --git a/README b/README
index a8264c0..ce58dc5 100644
--- a/README
+++ b/README
@@ -18,14 +18,14 @@ To get started using Apache Trafodion:
- release notes describing changes for particular releases can be viewed:
http://trafodion.apache.org/release-notes.html
- - the latest Apache Trafodion can be downloaded from Apache
+ - the latest Apache Trafodion can be downloaded from the Apache
distribution site or accessed from git
- download site:
https://dist.apache.org/repos/dist/release/trafodion
- git site:
- git@github.com:apache/incubator-trafodion
+ git@github.com:apache/trafodion
- To build and try out Apache Trafodion, please following our build
instructions as described:
http://git-wip-us.apache.org/repos/asf/trafodion/blob/6047c512/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index fb84714..9e72337 100644
--- a/README.md
+++ b/README.md
@@ -20,14 +20,14 @@ Hadoop.
http://trafodion.apache.org/release-notes.html
- - the latest Apache Trafodion can be downloaded from Apache
+ - the latest Apache Trafodion can be downloaded from the Apache
distribution site or accessed from git:
- download site:
https://dist.apache.org/repos/dist/release/trafodion
- git site:
- `git@github.com:apache/incubator-trafodion`
+ `git@github.com:apache/trafodion`
- To build and try out Apache Trafodion, please following our build
instructions as described:
http://git-wip-us.apache.org/repos/asf/trafodion/blob/6047c512/core/sqf/sql/scripts/install_apache_hadoop
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/install_apache_hadoop b/core/sqf/sql/scripts/install_apache_hadoop
index 9316b56..dbbbd4e 100755
--- a/core/sqf/sql/scripts/install_apache_hadoop
+++ b/core/sqf/sql/scripts/install_apache_hadoop
@@ -1528,7 +1528,7 @@ cd $MY_SW_ROOT
echo "Setting up DCS, REST and Phoenix tests..."
#Default GIT location
-GIT_DIR="git@github.com:apache/incubator-trafodion"
+GIT_DIR="git@github.com:apache/trafodion"
DCS_SRC=$TRAF_HOME/../../dcs
if [ -d $DCS_SRC ]; then
@@ -1540,7 +1540,7 @@ if [ -d $DCS_SRC ]; then
# Default location for phoenix_test
PHX_SRC=$TRAF_HOME/../../tests/phx
else
- TRAF_SRC=$MY_SW_ROOT/src/incubator-trafodion
+ TRAF_SRC=$MY_SW_ROOT/src/trafodion
if [ ! -d $TRAF_SRC ]; then
mkdir -p $MY_SW_ROOT/src
cd $MY_SW_ROOT/src
http://git-wip-us.apache.org/repos/asf/trafodion/blob/6047c512/core/sql/exp/exp_conv.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_conv.cpp b/core/sql/exp/exp_conv.cpp
index 8c5d443..ef1d002 100644
--- a/core/sql/exp/exp_conv.cpp
+++ b/core/sql/exp/exp_conv.cpp
@@ -2111,7 +2111,7 @@ ex_expr::exp_return_type convAsciiToInt64(Int64 &target,
return ex_expr::EXPR_OK;
}
/* remove below code according to discussion in github
- * https://github.com/apache/incubator-trafodion/pull/706
+ * https://github.com/apache/trafodion/pull/706
* with above validation, below checking is no longer needed
* comment out
http://git-wip-us.apache.org/repos/asf/trafodion/blob/6047c512/docs/client_install/pom.xml
----------------------------------------------------------------------
diff --git a/docs/client_install/pom.xml b/docs/client_install/pom.xml
index bb75de5..48b4660 100644
--- a/docs/client_install/pom.xml
+++ b/docs/client_install/pom.xml
@@ -61,9 +61,9 @@
</issueManagement>
<scm>
- <connection>scm:git:http://git-wip-us.apache.org/repos/asf/incubator-trafodion.git</connection>
- <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-trafodion.git</developerConnection>
- <url>https://git-wip-us.apache.org/repos/asf?p=incubator-trafodion.git</url>
+ <connection>scm:git:http://git-wip-us.apache.org/repos/asf/trafodion.git</connection>
+ <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/trafodion.git</developerConnection>
+ <url>https://git-wip-us.apache.org/repos/asf?p=trafodion.git</url>
<tag>HEAD</tag>
</scm>
@@ -187,7 +187,7 @@
<project-version>${env.TRAFODION_VER}</project-version>
<project-name>Trafodion</project-name>
<project-logo>${basedir}/../shared/trafodion-logo.jpg</project-logo>
- <project-support>user@trafodion.incubator.apache.org</project-support>
+ <project-support>user@trafodion.apache.org</project-support>
<docs-url>http://trafodion.apache.org/docs</docs-url>
<download-url>http://trafodion.apache.org/download.html</download-url>
<build-date>${maven.build.timestamp}</build-date>
@@ -217,7 +217,7 @@
<project-version>${env.TRAFODION_VER}</project-version>
<project-name>Trafodion</project-name>
<project-logo>${basedir}/../shared/trafodion-logo.jpg</project-logo>
- <project-support>user@trafodion.incubator.apache.org</project-support>
+ <project-support>user@trafodion.apache.org</project-support>
<docs-url>http://trafodion.apache.org/docs</docs-url>
<download-url>http://http://trafodion.apache.org/download.html</download-url>
<build-date>${maven.build.timestamp}</build-date>
http://git-wip-us.apache.org/repos/asf/trafodion/blob/6047c512/docs/command_interface/pom.xml
----------------------------------------------------------------------
diff --git a/docs/command_interface/pom.xml b/docs/command_interface/pom.xml
index 9eba1d6..546216d 100644
--- a/docs/command_interface/pom.xml
+++ b/docs/command_interface/pom.xml
@@ -61,9 +61,9 @@
</issueManagement>
<scm>
- <connection>scm:git:http://git-wip-us.apache.org/repos/asf/incubator-trafodion.git</connection>
- <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-trafodion.git</developerConnection>
- <url>https://git-wip-us.apache.org/repos/asf?p=incubator-trafodion.git</url>
+ <connection>scm:git:http://git-wip-us.apache.org/repos/asf/trafodion.git</connection>
+ <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/trafodion.git</developerConnection>
+ <url>https://git-wip-us.apache.org/repos/asf?p=trafodion.git</url>
<tag>HEAD</tag>
</scm>
@@ -187,7 +187,7 @@
<project-version>${env.TRAFODION_VER}</project-version>
<project-name>Trafodion</project-name>
<project-logo>${basedir}/../shared/trafodion-logo.jpg</project-logo>
- <project-support>user@trafodion.incubator.apache.org</project-support>
+ <project-support>user@trafodion.apache.org</project-support>
<docs-url>http://trafodion.apache.org/docs</docs-url>
<build-date>${maven.build.timestamp}</build-date>
<google-analytics-account>UA-72491210-1</google-analytics-account>
@@ -209,7 +209,7 @@
<project-version>${env.TRAFODION_VER}</project-version>
<project-name>Trafodion</project-name>
<project-logo>${basedir}/../shared/trafodion-logo.jpg</project-logo>
- <project-support>user@trafodion.incubator.apache.org</project-support>
+ <project-support>user@trafodion.apache.org</project-support>
<docs-url>http://trafodion.apache.org/docs</docs-url>
<build-date>${maven.build.timestamp}</build-date>
<pdf-stylesdir>${basedir}/../shared</pdf-stylesdir>
http://git-wip-us.apache.org/repos/asf/trafodion/blob/6047c512/docs/cqd_reference/pom.xml
----------------------------------------------------------------------
diff --git a/docs/cqd_reference/pom.xml b/docs/cqd_reference/pom.xml
index 2247918..609f657 100644
--- a/docs/cqd_reference/pom.xml
+++ b/docs/cqd_reference/pom.xml
@@ -63,9 +63,9 @@
</issueManagement>
<scm>
- <connection>scm:git:http://git-wip-us.apache.org/repos/asf/incubator-trafodion.git</connection>
- <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-trafodion.git</developerConnection>
- <url>https://git-wip-us.apache.org/repos/asf?p=incubator-trafodion.git</url>
+ <connection>scm:git:http://git-wip-us.apache.org/repos/asf/trafodion.git</connection>
+ <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/trafodion.git</developerConnection>
+ <url>https://git-wip-us.apache.org/repos/asf?p=trafodion.git</url>
<tag>HEAD</tag>
</scm>
@@ -189,7 +189,7 @@
<project-version>${env.TRAFODION_VER}</project-version>
<project-name>Trafodion</project-name>
<project-logo>${basedir}/../shared/trafodion-logo.jpg</project-logo>
- <project-support>user@trafodion.incubator.apache.org</project-support>
+ <project-support>user@trafodion.apache.org</project-support>
<docs-url>http://trafodion.apache.org/docs</docs-url>
<build-date>${maven.build.timestamp}</build-date>
<google-analytics-account>UA-72491210-1</google-analytics-account>
@@ -211,7 +211,7 @@
<project-version>${env.TRAFODION_VER}</project-version>
<project-name>Trafodion</project-name>
<project-logo>${basedir}/../shared/trafodion-logo.jpg</project-logo>
- <project-support>user@trafodion.incubator.apache.org</project-support>
+ <project-support>user@trafodion.apache.org</project-support>
<docs-url>http://trafodion.apache.org/docs</docs-url>
<build-date>${maven.build.timestamp}</build-date>
<pdf-stylesdir>${basedir}/../shared</pdf-stylesdir>
http://git-wip-us.apache.org/repos/asf/trafodion/blob/6047c512/docs/jdbct4ref_guide/pom.xml
----------------------------------------------------------------------
diff --git a/docs/jdbct4ref_guide/pom.xml b/docs/jdbct4ref_guide/pom.xml
index 6f9a6fa..18bc5b2 100644
--- a/docs/jdbct4ref_guide/pom.xml
+++ b/docs/jdbct4ref_guide/pom.xml
@@ -61,9 +61,9 @@
</issueManagement>
<scm>
- <connection>scm:git:http://git-wip-us.apache.org/repos/asf/incubator-trafodion.git</connection>
- <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-trafodion.git</developerConnection>
- <url>https://git-wip-us.apache.org/repos/asf?p=incubator-trafodion.git</url>
+ <connection>scm:git:http://git-wip-us.apache.org/repos/asf/trafodion.git</connection>
+ <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/trafodion.git</developerConnection>
+ <url>https://git-wip-us.apache.org/repos/asf?p=trafodion.git</url>
<tag>HEAD</tag>
</scm>
@@ -187,7 +187,7 @@
<project-version>${env.TRAFODION_VER}</project-version>
<project-name>Trafodion</project-name>
<project-logo>${basedir}/../shared/trafodion-logo.jpg</project-logo>
- <project-support>user@trafodion.incubator.apache.org</project-support>
+ <project-support>user@trafodion.apache.org</project-support>
<docs-url>http://trafodion.apache.org/docs</docs-url>
<build-date>${maven.build.timestamp}</build-date>
<google-analytics-account>UA-72491210-1</google-analytics-account>
@@ -216,7 +216,7 @@
<project-version>${env.TRAFODION_VER}</project-version>
<project-name>Trafodion</project-name>
<project-logo>${basedir}/../shared/trafodion-logo.jpg</project-logo>
- <project-support>user@trafodion.incubator.apache.org</project-support>
+ <project-support>user@trafodion.apache.org</project-support>
<docs-url>http://trafodion.apache.org/docs</docs-url>
<build-date>${maven.build.timestamp}</build-date>
</attributes>
http://git-wip-us.apache.org/repos/asf/trafodion/blob/6047c512/docs/load_transform/pom.xml
----------------------------------------------------------------------
diff --git a/docs/load_transform/pom.xml b/docs/load_transform/pom.xml
index 2b7b379..ab05add 100644
--- a/docs/load_transform/pom.xml
+++ b/docs/load_transform/pom.xml
@@ -61,9 +61,9 @@
</issueManagement>
<scm>
- <connection>scm:git:http://git-wip-us.apache.org/repos/asf/incubator-trafodion.git</connection>
- <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-trafodion.git</developerConnection>
- <url>https://git-wip-us.apache.org/repos/asf?p=incubator-trafodion.git</url>
+ <connection>scm:git:http://git-wip-us.apache.org/repos/asf/trafodion.git</connection>
+ <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/trafodion.git</developerConnection>
+ <url>https://git-wip-us.apache.org/repos/asf?p=trafodion.git</url>
<tag>HEAD</tag>
</scm>
@@ -187,7 +187,7 @@
<project-version>${env.TRAFODION_VER}</project-version>
<project-name>Trafodion</project-name>
<project-logo>${basedir}/../shared/trafodion-logo.jpg</project-logo>
- <project-support>user@trafodion.incubator.apache.org</project-support>
+ <project-support>user@trafodion.apache.org</project-support>
<docs-url>http://trafodion.apache.org/docs</docs-url>
<build-date>${maven.build.timestamp}</build-date>
<google-analytics-account>UA-72491210-1</google-analytics-account>
@@ -209,7 +209,7 @@
<project-version>${env.TRAFODION_VER}</project-version>
<project-name>Trafodion</project-name>
<project-logo>${basedir}/../shared/trafodion-logo.jpg</project-logo>
- <project-support>user@trafodion.incubator.apache.org</project-support>
+ <project-support>user@trafodion.apache.org</project-support>
<docs-url>http://trafodion.apache.org/docs</docs-url>
<build-date>${maven.build.timestamp}</build-date>
<pdf-stylesdir>${basedir}/../shared</pdf-stylesdir>
http://git-wip-us.apache.org/repos/asf/trafodion/blob/6047c512/docs/messages_guide/pom.xml
----------------------------------------------------------------------
diff --git a/docs/messages_guide/pom.xml b/docs/messages_guide/pom.xml
index 20f1a47..d3d2595 100644
--- a/docs/messages_guide/pom.xml
+++ b/docs/messages_guide/pom.xml
@@ -60,9 +60,9 @@
</issueManagement>
<scm>
- <connection>scm:git:http://git-wip-us.apache.org/repos/asf/incubator-trafodion.git</connection>
- <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-trafodion.git</developerConnection>
- <url>https://git-wip-us.apache.org/repos/asf?p=incubator-trafodion.git</url>
+ <connection>scm:git:http://git-wip-us.apache.org/repos/asf/trafodion.git</connection>
+ <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/trafodion.git</developerConnection>
+ <url>https://git-wip-us.apache.org/repos/asf?p=trafodion.git</url>
<tag>HEAD</tag>
</scm>
@@ -186,7 +186,7 @@
<project-version>${env.TRAFODION_VER}</project-version>
<project-name>Trafodion</project-name>
<project-logo>${basedir}/../shared/trafodion-logo.jpg</project-logo>
- <project-support>user@trafodion.incubator.apache.org</project-support>
+ <project-support>user@trafodion.apache.org</project-support>
<docs-url>http://trafodion.apache.org/docs</docs-url>
<build-date>${maven.build.timestamp}</build-date>
<google-analytics-account>UA-72491210-1</google-analytics-account>
@@ -208,7 +208,7 @@
<project-version>${env.TRAFODION_VER}</project-version>
<project-name>Trafodion</project-name>
<project-logo>${basedir}/../shared/trafodion-logo.jpg</project-logo>
- <project-support>user@trafodion.incubator.apache.org</project-support>
+ <project-support>user@trafodion.apache.org</project-support>
<docs-url>http://trafodion.apache.org/docs</docs-url>
<build-date>${maven.build.timestamp}</build-date>
<pdf-stylesdir>${basedir}/../shared</pdf-stylesdir>
http://git-wip-us.apache.org/repos/asf/trafodion/blob/6047c512/docs/odb_user/pom.xml
----------------------------------------------------------------------
diff --git a/docs/odb_user/pom.xml b/docs/odb_user/pom.xml
index 0227708..8251ad9 100644
--- a/docs/odb_user/pom.xml
+++ b/docs/odb_user/pom.xml
@@ -60,9 +60,9 @@
</issueManagement>
<scm>
- <connection>scm:git:http://git-wip-us.apache.org/repos/asf/incubator-trafodion.git</connection>
- <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-trafodion.git</developerConnection>
- <url>https://git-wip-us.apache.org/repos/asf?p=incubator-trafodion.git</url>
+ <connection>scm:git:http://git-wip-us.apache.org/repos/asf/trafodion.git</connection>
+ <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/trafodion.git</developerConnection>
+ <url>https://git-wip-us.apache.org/repos/asf?p=trafodion.git</url>
<tag>HEAD</tag>
</scm>
@@ -186,7 +186,7 @@
<project-version>${env.TRAFODION_VER}</project-version>
<project-name>Trafodion</project-name>
<project-logo>${basedir}/../shared/trafodion-logo.jpg</project-logo>
- <project-support>user@trafodion.incubator.apache.org</project-support>
+ <project-support>user@trafodion.apache.org</project-support>
<docs-url>http://trafodion.apache.org/docs</docs-url>
<build-date>${maven.build.timestamp}</build-date>
<google-analytics-account>UA-72491210-1</google-analytics-account>
@@ -208,7 +208,7 @@
<project-version>${env.TRAFODION_VER}</project-version>
<project-name>Trafodion</project-name>
<project-logo>${basedir}/../shared/trafodion-logo.jpg</project-logo>
- <project-support>user@trafodion.incubator.apache.org</project-support>
+ <project-support>user@trafodion.apache.org</project-support>
<docs-url>http://trafodion.apache.org/docs</docs-url>
<build-date>${maven.build.timestamp}</build-date>
<pdf-stylesdir>${basedir}/../shared</pdf-stylesdir>
http://git-wip-us.apache.org/repos/asf/trafodion/blob/6047c512/docs/provisioning_guide/pom.xml
----------------------------------------------------------------------
diff --git a/docs/provisioning_guide/pom.xml b/docs/provisioning_guide/pom.xml
index b6ee0d8..20bcb5a 100644
--- a/docs/provisioning_guide/pom.xml
+++ b/docs/provisioning_guide/pom.xml
@@ -61,9 +61,9 @@
</issueManagement>
<scm>
- <connection>scm:git:http://git-wip-us.apache.org/repos/asf/incubator-trafodion.git</connection>
- <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-trafodion.git</developerConnection>
- <url>https://git-wip-us.apache.org/repos/asf?p=incubator-trafodion.git</url>
+ <connection>scm:git:http://git-wip-us.apache.org/repos/asf/trafodion.git</connection>
+ <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/trafodion.git</developerConnection>
+ <url>https://git-wip-us.apache.org/repos/asf?p=trafodion.git</url>
<tag>HEAD</tag>
</scm>
@@ -187,7 +187,7 @@
<project-version>${env.TRAFODION_VER}</project-version>
<project-name>Trafodion</project-name>
<project-logo>${basedir}/../shared/trafodion-logo.jpg</project-logo>
- <project-support>user@trafodion.incubator.apache.org</project-support>
+ <project-support>user@trafodion.apache.org</project-support>
<docs-url>http://trafodion.apache.org/docs</docs-url>
<download-url>http://trafodion.apache.org/download.html</download-url>
<build-date>${maven.build.timestamp}</build-date>
@@ -210,7 +210,7 @@
<project-version>${env.TRAFODION_VER}</project-version>
<project-name>Trafodion</project-name>
<project-logo>${basedir}/../shared/trafodion-logo.jpg</project-logo>
- <project-support>user@trafodion.incubator.apache.org</project-support>
+ <project-support>user@trafodion.apache.org</project-support>
<docs-url>http://trafodion.apache.org/docs</docs-url>
<download-url>http://trafodion.apache.org/download.html</download-url>
<build-date>${maven.build.timestamp}</build-date>
http://git-wip-us.apache.org/repos/asf/trafodion/blob/6047c512/docs/spj_guide/pom.xml
----------------------------------------------------------------------
diff --git a/docs/spj_guide/pom.xml b/docs/spj_guide/pom.xml
index bba8f1e..46e4a15 100644
--- a/docs/spj_guide/pom.xml
+++ b/docs/spj_guide/pom.xml
@@ -61,9 +61,9 @@
</issueManagement>
<scm>
- <connection>scm:git:http://git-wip-us.apache.org/repos/asf/incubator-trafodion.git</connection>
- <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-trafodion.git</developerConnection>
- <url>https://git-wip-us.apache.org/repos/asf?p=incubator-trafodion.git</url>
+ <connection>scm:git:http://git-wip-us.apache.org/repos/asf/trafodion.git</connection>
+ <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/trafodion.git</developerConnection>
+ <url>https://git-wip-us.apache.org/repos/asf?p=trafodion.git</url>
<tag>HEAD</tag>
</scm>
@@ -187,7 +187,7 @@
<project-version>${env.TRAFODION_VER}</project-version>
<project-name>Trafodion</project-name>
<project-logo>${basedir}/../shared/trafodion-logo.jpg</project-logo>
- <project-support>user@trafodion.incubator.apache.org</project-support>
+ <project-support>user@trafodion.apache.org</project-support>
<docs-url>http://trafodion.apache.org/docs</docs-url>
<build-date>${maven.build.timestamp}</build-date>
<google-analytics-account>UA-72491210-1</google-analytics-account>
@@ -216,7 +216,7 @@
<project-version>${env.TRAFODION_VER}</project-version>
<project-name>Trafodion</project-name>
<project-logo>${basedir}/../shared/trafodion-logo.jpg</project-logo>
- <project-support>user@trafodion.incubator.apache.org</project-support>
+ <project-support>user@trafodion.apache.org</project-support>
<docs-url>http://trafodion.apache.org/docs</docs-url>
<build-date>${maven.build.timestamp}</build-date>
</attributes>
http://git-wip-us.apache.org/repos/asf/trafodion/blob/6047c512/docs/sql_reference/pom.xml
----------------------------------------------------------------------
diff --git a/docs/sql_reference/pom.xml b/docs/sql_reference/pom.xml
index 83edd20..0d6f3c8 100644
--- a/docs/sql_reference/pom.xml
+++ b/docs/sql_reference/pom.xml
@@ -63,9 +63,9 @@
</issueManagement>
<scm>
- <connection>scm:git:http://git-wip-us.apache.org/repos/asf/incubator-trafodion.git</connection>
- <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-trafodion.git</developerConnection>
- <url>https://git-wip-us.apache.org/repos/asf?p=incubator-trafodion.git</url>
+ <connection>scm:git:http://git-wip-us.apache.org/repos/asf/trafodion.git</connection>
+ <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/trafodion.git</developerConnection>
+ <url>https://git-wip-us.apache.org/repos/asf?p=trafodion.git</url>
<tag>HEAD</tag>
</scm>
@@ -190,7 +190,7 @@
<project-version>${env.TRAFODION_VER}</project-version>
<project-name>Trafodion</project-name>
<project-logo>${basedir}/../shared/trafodion-logo.jpg</project-logo>
- <project-support>user@trafodion.incubator.apache.org</project-support>
+ <project-support>user@trafodion.apache.org</project-support>
<docs-url>http://trafodion.apache.org/docs</docs-url>
<build-date>${maven.build.timestamp}</build-date>
<google-analytics-account>UA-72491210-1</google-analytics-account>
@@ -212,7 +212,7 @@
<project-version>${env.TRAFODION_VER}</project-version>
<project-name>Trafodion</project-name>
<project-logo>${basedir}/../shared/trafodion-logo.jpg</project-logo>
- <project-support>user@trafodion.incubator.apache.org</project-support>
+ <project-support>user@trafodion.apache.org</project-support>
<docs-url>http://trafodion.apache.org/docs</docs-url>
<build-date>${maven.build.timestamp}</build-date>
<pdf-stylesdir>${basedir}/../shared</pdf-stylesdir>
http://git-wip-us.apache.org/repos/asf/trafodion/blob/6047c512/docs/src/site/markdown/download.md
----------------------------------------------------------------------
diff --git a/docs/src/site/markdown/download.md b/docs/src/site/markdown/download.md
index b974fb4..ac014b1 100644
--- a/docs/src/site/markdown/download.md
+++ b/docs/src/site/markdown/download.md
@@ -125,4 +125,4 @@ To build Trafodion from source code, see the [Trafodion Contributor Guide](https
* * * *
-Note: when downloading from a mirror please check the [md5sum](http://www.apache.org/dev/release-signing#md5) and verify the [OpenPGP](http://www.apache.org/dev/release-signing#openpgp) compatible signature from the main [Apache](http://www.apache.org/) site. Links are provided above (next to the release download link). This [KEYS](http://www.apache.org/dist/incubator/trafodion/KEYS) file contains the public keys used for signing release. It is recommended that (when possible) a [web of trust](http://www.apache.org/dev/release-signing#web-of-trust) is used to confirm the identity of these keys. For more information, please see the [Apache Release FAQ](http://www.apache.org/dev/release.html).
+Note: when downloading from a mirror please check the [md5sum](http://www.apache.org/dev/release-signing#md5) and verify the [OpenPGP](http://www.apache.org/dev/release-signing#openpgp) compatible signature from the main [Apache](http://www.apache.org/) site. Links are provided above (next to the release download link). This [KEYS](http://www.apache.org/dist/trafodion/KEYS) file contains the public keys used for signing release. It is recommended that (when possible) a [web of trust](http://www.apache.org/dev/release-signing#web-of-trust) is used to confirm the identity of these keys. For more information, please see the [Apache Release FAQ](http://www.apache.org/dev/release.html).
http://git-wip-us.apache.org/repos/asf/trafodion/blob/6047c512/docs/src/site/markdown/enable-secure-trafodion.md
----------------------------------------------------------------------
diff --git a/docs/src/site/markdown/enable-secure-trafodion.md b/docs/src/site/markdown/enable-secure-trafodion.md
index c36cfcc..cc601f8 100644
--- a/docs/src/site/markdown/enable-secure-trafodion.md
+++ b/docs/src/site/markdown/enable-secure-trafodion.md
@@ -14,5 +14,5 @@
-->
Redirecting to the Trafodion Provisioning Guide...
-<p><meta http-equiv="refresh" content="0; url=http://trafodion.incubator.apache.org/docs/provisioning_guide/target/site/index.html#enable-security"></meta></p>
+<p><meta http-equiv="refresh" content="0; url=http://trafodion.apache.org/docs/provisioning_guide/target/site/index.html#enable-security"></meta></p>
http://git-wip-us.apache.org/repos/asf/trafodion/blob/6047c512/docs/src/site/markdown/quickstart.md
----------------------------------------------------------------------
diff --git a/docs/src/site/markdown/quickstart.md b/docs/src/site/markdown/quickstart.md
index bed136d..a2b138b 100644
--- a/docs/src/site/markdown/quickstart.md
+++ b/docs/src/site/markdown/quickstart.md
@@ -103,6 +103,6 @@ Trafodion provides connectivity services so that applications, tools, and other
For more information, refer to the [Trafodion Documentation Page] (documentation.html) for starting points. There is also a lot more information on the [Trafodion website] (http://trafodion.apache.org) and [Trafodion Wiki] (https://cwiki.apache.org/confluence/display/TRAFODION/Apache+Trafodion+Home) that you might refer to as you explore Trafodion.
-If you have questions or suggestions or just want to share what you've learned about Trafodion, you can contact a community of Trafodion users via the [Trafodion User Group mailing list](http://mail-archives.apache.org/mod_mbox/incubator-trafodion-user/) or other [Project Mailing Lists] (http://trafodion.apache.org/mail-lists.html)
+If you have questions or suggestions or just want to share what you've learned about Trafodion, you can contact a community of Trafodion users via the [Trafodion User Group mailing list](http://mail-archives.apache.org/mod_mbox/trafodion-user/) or other [Project Mailing Lists] (http://trafodion.apache.org/mail-lists.html)
Have fun with Trafodion!
http://git-wip-us.apache.org/repos/asf/trafodion/blob/6047c512/docs/src/site/markdown/release-notes-1-0-1.md
----------------------------------------------------------------------
diff --git a/docs/src/site/markdown/release-notes-1-0-1.md b/docs/src/site/markdown/release-notes-1-0-1.md
index 83b2544..61c4e86 100644
--- a/docs/src/site/markdown/release-notes-1-0-1.md
+++ b/docs/src/site/markdown/release-notes-1-0-1.md
@@ -247,4 +247,4 @@ To sample one percent of the rows, regardless of the table size, you must explic
**Cause:** This is a day-one issue.
-**Solution:** Retry the query after two minutes. Set <code>CQD HIST_NO_STATS_REFRESH_INTERVAL</code> to '<code>0</code>'. Run an <code>UPDATE STATISTICS</code> statement. Perform DML operations in a different session.
\ No newline at end of file
+**Solution:** Retry the query after two minutes. Set <code>CQD HIST_NO_STATS_REFRESH_INTERVAL</code> to '<code>0</code>'. Run an <code>UPDATE STATISTICS</code> statement. Perform DML operations in a different session.
http://git-wip-us.apache.org/repos/asf/trafodion/blob/6047c512/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e23e8f7..91b615b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,9 +63,9 @@
</issueManagement>
<scm>
- <connection>scm:git:http://git-wip-us.apache.org/repos/asf/incubator-trafodion.git</connection>
- <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-trafodion.git</developerConnection>
- <url>https://git-wip-us.apache.org/repos/asf?p=incubator-trafodion.git</url>
+ <connection>scm:git:http://git-wip-us.apache.org/repos/asf/trafodion.git</connection>
+ <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/trafodion.git</developerConnection>
+ <url>https://git-wip-us.apache.org/repos/asf?p=trafodion.git</url>
<tag>HEAD</tag>
</scm>
@@ -77,35 +77,35 @@
<mailingLists>
<mailingList>
<name>User List</name>
- <subscribe>user-subscribe@trafodion.incubator.apache.org</subscribe>
- <unsubscribe>user-unsubscribe@trafodion.incubator.apache.org</unsubscribe>
- <post>user@trafodion.incubator.apache.org</post>
- <archive>http://mail-archives.apache.org/mod_mbox/incubator-trafodion-user/</archive>
+ <subscribe>user-subscribe@trafodion.apache.org</subscribe>
+ <unsubscribe>user-unsubscribe@trafodion.apache.org</unsubscribe>
+ <post>user@trafodion.apache.org</post>
+ <archive>http://mail-archives.apache.org/mod_mbox/trafodion-user/</archive>
</mailingList>
<mailingList>
<name>Developer List</name>
- <subscribe>dev-subscribe@trafodion.incubator.apache.org</subscribe>
- <unsubscribe>dev-unsubscribe@trafodion.incubator.apache.org</unsubscribe>
- <post>dev@trafodion.incubator.apache.org</post>
- <archive>http://mail-archives.apache.org/mod_mbox/incubator-trafodion-dev/</archive>
+ <subscribe>dev-subscribe@trafodion.apache.org</subscribe>
+ <unsubscribe>dev-unsubscribe@trafodion.apache.org</unsubscribe>
+ <post>dev@trafodion.apache.org</post>
+ <archive>http://mail-archives.apache.org/mod_mbox/trafodion-dev/</archive>
</mailingList>
<mailingList>
<name>GitHub Codereview List</name>
- <subscribe>codereview-subscribe@trafodion.incubator.apache.org</subscribe>
- <unsubscribe>codereview-unsubscribe@trafodion.incubator.apache.org</unsubscribe>
- <archive>http://mail-archives.apache.org/mod_mbox/incubator-trafodion-codereview/</archive>
+ <subscribe>codereview-subscribe@trafodion.apache.org</subscribe>
+ <unsubscribe>codereview-unsubscribe@trafodion.apache.org</unsubscribe>
+ <archive>http://mail-archives.apache.org/mod_mbox/trafodion-codereview/</archive>
</mailingList>
<mailingList>
<name>Commits List</name>
- <subscribe>commits-subscribe@trafodion.incubator.apache.org</subscribe>
- <unsubscribe>commits-unsubscribe@trafodion.incubator.apache.org</unsubscribe>
- <archive>http://mail-archives.apache.org/mod_mbox/incubator-trafodion-commits/</archive>
+ <subscribe>commits-subscribe@trafodion.apache.org</subscribe>
+ <unsubscribe>commits-unsubscribe@trafodion.apache.org</unsubscribe>
+ <archive>http://mail-archives.apache.org/mod_mbox/trafodion-commits/</archive>
</mailingList>
<mailingList>
<name>Issues List</name>
- <subscribe>issues-subscribe@trafodion.incubator.apache.org</subscribe>
- <unsubscribe>issues-unsubscribe@trafodion.incubator.apache.org</unsubscribe>
- <archive>http://mail-archives.apache.org/mod_mbox/incubator-trafodion-issues/</archive>
+ <subscribe>issues-subscribe@trafodion.apache.org</subscribe>
+ <unsubscribe>issues-unsubscribe@trafodion.apache.org</unsubscribe>
+ <archive>http://mail-archives.apache.org/mod_mbox/trafodion-issues/</archive>
</mailingList>
</mailingLists>
@@ -113,7 +113,7 @@
<developer>
<id>TrafodionDeveloper</id>
<name>See list of Trafodion developers</name>
- <email>dev@trafodion.incubator.apache.org</email>
+ <email>dev@trafodion.apache.org</email>
<url>https://cwiki.apache.org/confluence/display/TRAFODION/Contributors</url>
</developer>
</developers>
@@ -121,7 +121,7 @@
<contributors>
<contributor>
<name>See list of Trafodion contributors</name>
- <email>dev@trafodion.incubator.apache.org</email>
+ <email>dev@trafodion.apache.org</email>
<url>https://cwiki.apache.org/confluence/display/TRAFODION/Contributors</url>
</contributor>
</contributors>
http://git-wip-us.apache.org/repos/asf/trafodion/blob/6047c512/tools/docker/Dockerfile
----------------------------------------------------------------------
diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
index 21cb98e..c849072 100644
--- a/tools/docker/Dockerfile
+++ b/tools/docker/Dockerfile
@@ -15,7 +15,7 @@
# limitations under the License.
FROM centos:centos6.6
-MAINTAINER Trafodion Community <de...@trafodion.incubator.apache.org>
+MAINTAINER Trafodion Community <de...@trafodion.apache.org>
LABEL Vendor="Apache Trafodion"
LABEL version=unstable
http://git-wip-us.apache.org/repos/asf/trafodion/blob/6047c512/tools/docker/start-compile-docker.sh
----------------------------------------------------------------------
diff --git a/tools/docker/start-compile-docker.sh b/tools/docker/start-compile-docker.sh
index f9697ec..74e3661 100755
--- a/tools/docker/start-compile-docker.sh
+++ b/tools/docker/start-compile-docker.sh
@@ -42,7 +42,7 @@ ENV HOME /home/${USER_NAME}
RUN cd /home/${USER_NAME} \
&& mkdir download \
&& mkdir trafodion-build-tools \
- && wget https://raw.githubusercontent.com/apache/incubator-trafodion/master/install/traf_tools_setup.sh \
+ && wget https://raw.githubusercontent.com/apache/trafodion/master/install/traf_tools_setup.sh \
&& chmod +x traf_tools_setup.sh \
&& ./traf_tools_setup.sh -d ~/download -i ~/trafodion-build-tools \
&& rm -fr ./download \
@@ -56,9 +56,9 @@ pushd ${SCRIPT_DIR}/../..
docker run -i -t \
--rm=true \
- -w "/home/${USER_NAME}/incubator-trafodion" \
+ -w "/home/${USER_NAME}/trafodion" \
-u "${USER_NAME}" \
- -v "$PWD:/home/${USER_NAME}/incubator-trafodion" \
+ -v "$PWD:/home/${USER_NAME}/trafodion" \
-v "$HOME/.m2:/home/${USER_NAME}/.m2" \
--name TrafodionEnv \
${IMAGE_NAME}-${USER_NAME} \
[20/32] trafodion git commit: Merge remote branch
'origin/pr/1242/head' into merge_1242
Posted by li...@apache.org.
Merge remote branch 'origin/pr/1242/head' into merge_1242
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/3254cc16
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/3254cc16
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/3254cc16
Branch: refs/heads/master
Commit: 3254cc16b259a6a513cabc391699f44f29850cf1
Parents: e26ec04 de664c3
Author: Sandhya Sundaresan <sa...@apache.org>
Authored: Tue Sep 26 05:31:16 2017 +0000
Committer: Sandhya Sundaresan <sa...@apache.org>
Committed: Tue Sep 26 05:31:16 2017 +0000
----------------------------------------------------------------------
.../org/trafodion/jdbc/t4/T4Properties.java | 20 ++++++++++++++++++++
.../org/trafodion/jdbc/t4/TrafT4ResultSet.java | 8 ++++----
.../java/org/trafodion/ci/SessionInterface.java | 2 ++
3 files changed, 26 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
[08/32] trafodion git commit: Main change:
Posted by li...@apache.org.
http://git-wip-us.apache.org/repos/asf/trafodion/blob/f1864484/core/sql/regress/executor/EXPECTED130
----------------------------------------------------------------------
diff --git a/core/sql/regress/executor/EXPECTED130 b/core/sql/regress/executor/EXPECTED130
index 87a1d05..6b52203 100644
--- a/core/sql/regress/executor/EXPECTED130
+++ b/core/sql/regress/executor/EXPECTED130
@@ -63,9 +63,9 @@ C1
C1 C2
----------- ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
----------------------------------------
- 1 LOBH000000020001004521773054977751551845217730572979065218212360625565346135020"TRAFODION"."LOB130"
- 2 LOBH000000020001004521773054977751551845217730575426024718212360625592037380020"TRAFODION"."LOB130"
- 3 LOBH000000020001004521773054977751551845217730577394592318212360625613791173020"TRAFODION"."LOB130"
+ 1 LOBH0000000200010789269709250085236319789269709263410318218212370878104855192020"TRAFODION"."LOB130"
+ 2 LOBH0000000200010789269709250085236319789269709264004324418212370878112140465020"TRAFODION"."LOB130"
+ 3 LOBH0000000200010789269709250085236319789269709264603729518212370878118079347020"TRAFODION"."LOB130"
--- 3 row(s) selected.
>>
@@ -654,7 +654,7 @@ And the dish ran away with the fork !
>>sh grep "^LOBH" TMP130 | sed "s/^/extract lobtofile(LOB '/g" | sed "s/$/' , 'tlob130_txt1.txt');/g" >> t130_extract_command;
>>
>>obey t130_extract_command;
->>extract lobtofile(LOB 'LOBH000000020001004521773054979487561845217730741742859818212360627257261284020"TRAFODION"."LOB130"
' , 'tlob130_txt1.txt');
+>>extract lobtofile(LOB 'LOBH0000000200010789269709250093030419789269709339542449418212370878867608341020"TRAFODION"."LOB130"
' , 'tlob130_txt1.txt');
Success. Targetfile :tlob130_txt1.txt Length : 19
--- SQL operation complete.
@@ -670,7 +670,7 @@ Success. Targetfile :tlob130_txt1.txt Length : 19
>>sh rm t130_extract_command;
>>sh grep "^LOBH" TMP130 | sed "s/^/extract lobtofile(LOB '/g" | sed "s/$/' , 'tlob130_deep.jpg');/g" >> t130_extract_command;
>>obey t130_extract_command;
->>extract lobtofile(LOB 'LOBH000000020001004521773054979514421845217730753331456518212360627372759041020"TRAFODION"."LOB130"
' , 'tlob130_deep.jpg');
+>>extract lobtofile(LOB 'LOBH0000000200010789269709250093195519789269709346199639118212370878934176767020"TRAFODION"."LOB130"
' , 'tlob130_deep.jpg');
Success. Targetfile :tlob130_deep.jpg Length : 159018
--- SQL operation complete.
@@ -686,7 +686,7 @@ Success. Targetfile :tlob130_deep.jpg Length : 159018
>>sh grep "^LOBH" TMP130 | sed "s/^/extract lobtofile(LOB '/g" | sed "s/$/' , 'tlob130_anoush.jpg');/g" >> t130_extract_command;
>>
>>obey t130_extract_command;
->>extract lobtofile(LOB 'LOBH000000020001004521773054979514421845217730753331456518212360627372759041020"TRAFODION"."LOB130"
' , 'tlob130_anoush.jpg');
+>>extract lobtofile(LOB 'LOBH0000000200010789269709250093195519789269709346199639118212370878934176767020"TRAFODION"."LOB130"
' , 'tlob130_anoush.jpg');
Success. Targetfile :tlob130_anoush.jpg Length : 230150
--- SQL operation complete.
@@ -847,7 +847,7 @@ Column Name : c2
Input a filename to extract to :
Output File Name : lobc2out.jpg
Extracting lob handle for column c2...
-LOB handle for c2: LOBH000000020001004521773054979514421845217730753331456518212360627372759041020"TRAFODION"."LOB130"
+LOB handle for c2: LOBH0000000200010789269709250093195519789269709346199639118212370878934176767020"TRAFODION"."LOB130"
Extracting LOB data length for the above handle...
LOB data length :230150
Extracting lob data into file in chunks ...
@@ -921,7 +921,7 @@ And the dish ran away with the spoon.
>>sh rm t130_extract_command;
>>sh grep "^LOBH" TMP130 | sed "s/^/extract lobtofile(LOB '/g" | sed "s/$/' , 'tlob130_deep2.jpg');/g" >> t130_extract_command;
>>obey t130_extract_command;
->>extract lobtofile(LOB 'LOBH000000020002004521773054980105951845217730796607893818212360627806139125020"TRAFODION"."LOB130"
' , 'tlob130_deep2.jpg');
+>>extract lobtofile(LOB 'LOBH0000000200020789269709250096808819789269709373537864718212370879207561632020"TRAFODION"."LOB130"
' , 'tlob130_deep2.jpg');
Success. Targetfile :tlob130_deep2.jpg Length : 159018
--- SQL operation complete.
@@ -953,7 +953,7 @@ Hey diddle diddle,
>>sh rm t130_extract_command;
>>sh grep "^LOBH" TMP130 | sed "s/^/extract lobtofile(LOB '/g" | sed "s/$/' , 'tlob130_anoush3.jpg',create,truncate);/g" >> t130_extract_command;
>>obey t130_extract_command;
->>extract lobtofile(LOB 'LOBH000000020003004521773054980180651845217730805462671518212360627894957464020"TRAFODION"."LOB130"
' , 'tlob130_anoush3.jpg',create,truncate);
+>>extract lobtofile(LOB 'LOBH0000000200030789269709250097259519789269709378642018118212370879258524867020"TRAFODION"."LOB130"
' , 'tlob130_anoush3.jpg',create,truncate);
Success. Targetfile :tlob130_anoush3.jpg Length : 230150
--- SQL operation complete.
@@ -1054,12 +1054,12 @@ Lob Information for table: "TRAFODION".LOB130.TLOB130GT2
ColumnName : C2
Lob Location : /user/trafodion/lobs
- LOB Data File: LOBP_00452177305498076106_0001
+ LOB Data File: LOBP_07892697092501002172_0001
LOB EOD : 0
LOB Used Len : 0
ColumnName : C3
Lob Location : /user/trafodion/lobs
- LOB Data File: LOBP_00452177305498076106_0002
+ LOB Data File: LOBP_07892697092501002172_0002
LOB EOD : 0
LOB Used Len : 0
ColumnName : C4
@@ -1074,8 +1074,8 @@ Lob Information for table: "TRAFODION".LOB130.TLOB130GT2
CATALOG_NAME SCHEMA_NAME OBJECT_NAME COLUMN_NAME
LOB_LOCATION LOB_DATA_FILE LOB_DATA_FILE_SIZE_EOD LOB_DATA_FILE_SIZE_USED
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--------------------------------- ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- ---------------------- -----------------------
-TRAFODION LOB130 TLOB130GT2 C2
/user/trafodion/lobs LOBP_00452177305498076106_0001 0 0
-TRAFODION LOB130 TLOB130GT2 C3
/user/trafodion/lobs LOBP_00452177305498076106_0002 0 0
+TRAFODION LOB130 TLOB130GT2 C2
/user/trafodion/lobs LOBP_07892697092501002172_0001 0 0
+TRAFODION LOB130 TLOB130GT2 C3
/user/trafodion/lobs LOBP_07892697092501002172_0002 0 0
TRAFODION LOB130 TLOB130GT2 C4
External HDFS Location External HDFS File 0 0
--- 3 row(s) selected.
@@ -1096,17 +1096,17 @@ Lob Information for table: "TRAFODION".LOB130.TLOB130GT
ColumnName : C2
Lob Location : /user/trafodion/lobs
- LOB Data File: LOBP_00452177305498070471_0001
+ LOB Data File: LOBP_07892697092500999026_0001
LOB EOD : 15
LOB Used Len : 15
ColumnName : C3
Lob Location : /user/trafodion/lobs
- LOB Data File: LOBP_00452177305498070471_0002
+ LOB Data File: LOBP_07892697092500999026_0002
LOB EOD : 15
LOB Used Len : 15
ColumnName : C4
Lob Location : /user/trafodion/lobs
- LOB Data File: LOBP_00452177305498070471_0003
+ LOB Data File: LOBP_07892697092500999026_0003
LOB EOD : 45
LOB Used Len : 45
@@ -1116,9 +1116,9 @@ Lob Information for table: "TRAFODION".LOB130.TLOB130GT
CATALOG_NAME SCHEMA_NAME OBJECT_NAME COLUMN_NAME
LOB_LOCATION LOB_DATA_FILE LOB_DATA_FILE_SIZE_EOD LOB_DATA_FILE_SIZE_USED
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--------------------------------- ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- ---------------------- -----------------------
-TRAFODION LOB130 TLOB130GT C2
/user/trafodion/lobs LOBP_00452177305498070471_0001 15 15
-TRAFODION LOB130 TLOB130GT C3
/user/trafodion/lobs LOBP_00452177305498070471_0002 15 15
-TRAFODION LOB130 TLOB130GT C4
/user/trafodion/lobs LOBP_00452177305498070471_0003 45 45
+TRAFODION LOB130 TLOB130GT C2
/user/trafodion/lobs LOBP_07892697092500999026_0001 15 15
+TRAFODION LOB130 TLOB130GT C3
/user/trafodion/lobs LOBP_07892697092500999026_0002 15 15
+TRAFODION LOB130 TLOB130GT C4
/user/trafodion/lobs LOBP_07892697092500999026_0003 45 45
--- 3 row(s) selected.
>>delete from tlob130gt where c1=2;
@@ -1135,17 +1135,17 @@ Lob Information for table: "TRAFODION".LOB130.TLOB130GT
ColumnName : C2
Lob Location : /user/trafodion/lobs
- LOB Data File: LOBP_00452177305498070471_0001
+ LOB Data File: LOBP_07892697092500999026_0001
LOB EOD : 30
LOB Used Len : 25
ColumnName : C3
Lob Location : /user/trafodion/lobs
- LOB Data File: LOBP_00452177305498070471_0002
+ LOB Data File: LOBP_07892697092500999026_0002
LOB EOD : 31
LOB Used Len : 26
ColumnName : C4
Lob Location : /user/trafodion/lobs
- LOB Data File: LOBP_00452177305498070471_0003
+ LOB Data File: LOBP_07892697092500999026_0003
LOB EOD : 71
LOB Used Len : 56
@@ -1155,9 +1155,9 @@ Lob Information for table: "TRAFODION".LOB130.TLOB130GT
CATALOG_NAME SCHEMA_NAME OBJECT_NAME COLUMN_NAME
LOB_LOCATION LOB_DATA_FILE LOB_DATA_FILE_SIZE_EOD LOB_DATA_FILE_SIZE_USED
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--------------------------------- ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- ---------------------- -----------------------
-TRAFODION LOB130 TLOB130GT C2
/user/trafodion/lobs LOBP_00452177305498070471_0001 30 25
-TRAFODION LOB130 TLOB130GT C3
/user/trafodion/lobs LOBP_00452177305498070471_0002 31 26
-TRAFODION LOB130 TLOB130GT C4
/user/trafodion/lobs LOBP_00452177305498070471_0003 71 56
+TRAFODION LOB130 TLOB130GT C2
/user/trafodion/lobs LOBP_07892697092500999026_0001 30 25
+TRAFODION LOB130 TLOB130GT C3
/user/trafodion/lobs LOBP_07892697092500999026_0002 31 26
+TRAFODION LOB130 TLOB130GT C4
/user/trafodion/lobs LOBP_07892697092500999026_0003 71 56
--- 3 row(s) selected.
>>
@@ -1328,12 +1328,12 @@ Lob Information for table: "TRAFODION".LOB130.TLOB130EXT
ColumnName : C2
Lob Location : /user/trafodion/lobs
- LOB Data File: LOBP_00452177305498099204_0001
+ LOB Data File: LOBP_07892697092501013739_0001
LOB EOD : 70
LOB Used Len : 42
ColumnName : C3
Lob Location : /user/trafodion/lobs
- LOB Data File: LOBP_00452177305498099204_0002
+ LOB Data File: LOBP_07892697092501013739_0002
LOB EOD : 125
LOB Used Len : 68
ColumnName : C4
@@ -1348,8 +1348,8 @@ Lob Information for table: "TRAFODION".LOB130.TLOB130EXT
CATALOG_NAME SCHEMA_NAME OBJECT_NAME COLUMN_NAME
LOB_LOCATION LOB_DATA_FILE LOB_DATA_FILE_SIZE_EOD LOB_DATA_FILE_SIZE_USED
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--------------------------------- ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- ---------------------- -----------------------
-TRAFODION LOB130 TLOB130EXT C2
/user/trafodion/lobs LOBP_00452177305498099204_0001 70 42
-TRAFODION LOB130 TLOB130EXT C3
/user/trafodion/lobs LOBP_00452177305498099204_0002 125 68
+TRAFODION LOB130 TLOB130EXT C2
/user/trafodion/lobs LOBP_07892697092501013739_0001 70 42
+TRAFODION LOB130 TLOB130EXT C3
/user/trafodion/lobs LOBP_07892697092501013739_0002 125 68
TRAFODION LOB130 TLOB130EXT C4
External HDFS Location External HDFS File 0 0
--- 3 row(s) selected.
@@ -1366,9 +1366,9 @@ Column Name : c4
Input a filename to extract to :
Output File Name : lobc4ext.txt
Extracting lob handle for column c4...
-LOB handle for c4: LOBH000000080003004521773054980992041845217730910800048818212360628948202356020"TRAFODION"."LOB130"
+LOB handle for c4: LOBH0000000800030789269709250101373919789269709433659319618212370879808793595020"TRAFODION"."LOB130"
Extracting LOB data length for the above handle...
-LOB data length :44
+LOB data length :19
Extracting lob data into file in chunks ...
Wrote 19 bytes to file : lobc4ext.txt
>>sh cat lobc4ext.txt |tee -a LOG130;
@@ -1432,7 +1432,7 @@ Table name : TRAFODION.LOB130.t130lob5
Input lob column name to get handle from :
Column Name : c2
Extracting lob handle for column c2...
-LOB handle for c2: LOBH000000020001004521773054981739381845217730958615332018212360629426346494020"TRAFODION"."LOB130"
+LOB handle for c2: LOBH0000000200010789269709250106581019789269709470354926518212370880175708319020"TRAFODION"."LOB130"
>>select lobtostring(c2,20) from t130lob5;
(EXPR)
@@ -1449,7 +1449,7 @@ Table name : TRAFODION.LOB130.t130lob5
Input lob column name to get handle from :
Column Name : c2
Extracting lob handle for column c2...
-LOB handle for c2: LOBH000000020001004521773054981739381845217730958615332018212360629426346494020"TRAFODION"."LOB130"
+LOB handle for c2: LOBH0000000200010789269709250106581019789269709470354926518212370880175708319020"TRAFODION"."LOB130"
>>select lobtostring(c2,40) from t130lob5;
(EXPR)
@@ -1466,7 +1466,7 @@ Table name : TRAFODION.LOB130.t130lob5
Input lob column name to get handle from :
Column Name : c2
Extracting lob handle for column c2...
-LOB handle for c2: LOBH000000020001004521773054981739381845217730958615332018212360629426346494020"TRAFODION"."LOB130"
+LOB handle for c2: LOBH0000000200010789269709250106581019789269709470354926518212370880175708319020"TRAFODION"."LOB130"
>>select lobtostring(c2,20) from t130lob5;
(EXPR)
@@ -1483,7 +1483,7 @@ Table name : TRAFODION.LOB130.t130lob5
Input lob column name to get handle from :
Column Name : c2
Extracting lob handle for column c2...
-LOB handle for c2: LOBH000000020001004521773054981739381845217730958615332018212360629426346494020"TRAFODION"."LOB130"
+LOB handle for c2: LOBH0000000200010789269709250106581019789269709470354926518212370880175708319020"TRAFODION"."LOB130"
>>select lobtostring(c2,40) from t130lob5;
(EXPR)
@@ -1510,7 +1510,7 @@ zzzzzzzzzzzzzzzzzzzz
C2
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
---------------------------
-LOBH000000020001004521773054980992041845217730978467538918212360629625048479020"TRAFODION"."LOB130"
+LOBH0000000200010789269709250101373919789269709484761570418212370880319729808020"TRAFODION"."LOB130"
--- 1 row(s) selected.
>>-- following should return error since only external lobs will be allowed
@@ -1553,9 +1553,9 @@ LOBH000000020001004521773054980992041845217730978467538918212360629625048479020"
Tables in Schema TRAFODION.LOBSCH
=================================
-LOBDescChunks__00452177305498204482_0001
-LOBDescHandle__00452177305498204482_0001
-LOBMD__00452177305498204482
+LOBDescChunks__07892697092501086222_0001
+LOBDescHandle__07892697092501086222_0001
+LOBMD__07892697092501086222
SB_HISTOGRAMS
SB_HISTOGRAM_INTERVALS
SB_PERSISTENT_SAMPLES
[04/32] trafodion git commit: cherry-pick Load XML Files
Posted by li...@apache.org.
cherry-pick Load XML Files
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/fb007c00
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/fb007c00
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/fb007c00
Branch: refs/heads/master
Commit: fb007c00469a36b37e58d1821581fdbe38527626
Parents: 08b41ed
Author: liu.yu <yu...@esgyn.cn>
Authored: Sun Aug 13 16:06:25 2017 +0800
Committer: liu.yu <yu...@esgyn.cn>
Committed: Tue Aug 22 11:54:15 2017 +0800
----------------------------------------------------------------------
docs/odb_user/src/asciidoc/_chapters/load.adoc | 38 +++++++++------------
1 file changed, 17 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/fb007c00/docs/odb_user/src/asciidoc/_chapters/load.adoc
----------------------------------------------------------------------
diff --git a/docs/odb_user/src/asciidoc/_chapters/load.adoc b/docs/odb_user/src/asciidoc/_chapters/load.adoc
index 6a2eb86..91c0125 100644
--- a/docs/odb_user/src/asciidoc/_chapters/load.adoc
+++ b/docs/odb_user/src/asciidoc/_chapters/load.adoc
@@ -455,7 +455,7 @@ JOB:FIXED:23:10 <- insert into JOB characters starting at position
Load as follows:
```
-$ odb64luo –u user –p xx –d dsn \
+$ odb64luo –u user –p xx –d dsn \
-l src=frends1.dat:tgt=TRAFODION.MFTEST.FRIENDS1:map=ff.map:ns=\?:pc=32
```
@@ -494,16 +494,16 @@ You can use a mapfile like this:
```
~/Devel/odb $ cat person.map
PID:SEQ:100
-FNAME:DSRAND:datasets/first_names.txt
-LNAME:DSRAND:datasets/last_names.txt
+FNAME:DSRAND:datasets/first_names.txt
+LNAME:DSRAND:datasets/last_names.txt
COUNTRY:DSRAND:datasets/countries.txt
-CITY:DSRAND:datasets/cities.txt
+CITY:DSRAND:datasets/cities.txt
BDATE:DRAND:1800:2012
SEX:LSTRAND:M,F,U
-EMAIL:EMRAND:3:12:5:8:com,edu,org,net
-SALARY:NRAND:9:2
-EMPL:DSRAND:datasets/fortune500.txt
-NOTES:TXTRAND:20:80:datasets/lorem_ipsum.txt
+EMAIL:EMRAND:3:12:5:8:com,edu,org,net
+SALARY:NRAND:9:2
+EMPL:DSRAND:datasets/fortune500.txt
+NOTES:TXTRAND:20:80:datasets/lorem_ipsum.txt
LOADTS:CTSTAMP
```
@@ -599,7 +599,7 @@ Then:
* Fifth column (`COMMENT`) is loaded with the fifth column in the input file (`COMMENT:4`)
[[load_binary_files]]
-== Loading Binary Files
+== Load Binary Files
Assuming that your back-end database (and your ODBC Driver) supports BLOB data types, or equivalent,
you can use odb to directly load binary (or any other) files into a database column using the `[:em=char]` symbol
to identify the file to be loaded into that specific database field.
@@ -637,7 +637,6 @@ odb considers the string following the “em” character as the path of the fil
NOTE: odb does not load rows where the size of the input file is greater than the target database column.
-=======
[[load_xml_files]]
== Load XML Files
Trafodion odb supports loading XML files into tables, the key construct for XML files can be an element or an attribute.
@@ -741,7 +740,7 @@ And an input file that contains:
The max length of the second field in this file is:
```
-~/Devel/odb $ awk -F\, 'BEGIN\{max=0} \{if(NF==2)\{len=length($i);if(len>max)max=len}}
+~/Devel/odb $ awk -F\, 'BEGIN\{max=0} \{if(NF==2)\{len=length($i);if(len>max)max=len}}
END\{print max}' tmx.dat
15
```
@@ -841,7 +840,7 @@ The following table describes each extract operator:
[cols="30%,70%",options="header",]
|===
-| Extract option | Meaning
+| Extract option | Meaning
| `src=<CAT.SCH.TAB>\|-file` | Defines the source table(s). You can use: +
+
- a single table name (for example TRAFODION.MFTEST.LINEITEM) +
@@ -1178,7 +1177,7 @@ You can use odb to copy a list of tables from one database to another.
*Example*
```
-~/Devel/odb $ cat tlist.txt
+~/Devel/odb $ cat tlist.txt
# List of tables to extract
src=TRAFODION.MAURIZIO.ORDERS
@@ -1198,7 +1197,7 @@ Please note the `src=-tlist.txt`. This command copies:
[cols="50%,50%",options="header",]
|===
-| Source | Target
+| Source | Target
| `TRAFODION.MAURIZIO.ORDERS` | `tpch.stg_orders`
| `TRAFODION.MAURIZIO.CUSTOMER` | `tpch.stg_customer`
| `TRAFODION.MAURIZIO.PART` | `tpch.stg_part`
@@ -1216,10 +1215,10 @@ Using different _splitby columns_.
```
~/Devel/odb $ cat tlist2.txt
-# List of tables to extract and their “splitby columns”
-src=TRAFODION.MAURIZIO.ORDERS:splitby=O_ORDERKEY
-src=TRAFODION.MAURIZIO.CUSTOMER:splitby=C_CUSTOMERKEY
-src=TRAFODION.MAURIZIO.PART:splitby=P_PARTKEY
+# List of tables to extract and their “splitby columns”
+src=TRAFODION.MAURIZIO.ORDERS:splitby=O_ORDERKEY
+src=TRAFODION.MAURIZIO.CUSTOMER:splitby=C_CUSTOMERKEY
+src=TRAFODION.MAURIZIO.PART:splitby=P_PARTKEY
src=TRAFODION.MAURIZIO.LINEITEM:splitby=L_PARTKEY
```
@@ -1285,6 +1284,3 @@ relational database. For example, you can copy to from HIVE and other databases
from/to Hadoop. odb interacts directly with the HDFS file system using *libhdfs*.
+
This option is currently available only under Linux.
-
-
-
[24/32] trafodion git commit: [TRAFODION-2861] Backport to release2.2
branch
Posted by li...@apache.org.
[TRAFODION-2861] Backport to release2.2 branch
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/5be0d2e5
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/5be0d2e5
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/5be0d2e5
Branch: refs/heads/master
Commit: 5be0d2e5eacc4a48aeb5b407e5eacf76f5b10ec2
Parents: 3254cc1 6429a0c
Author: Liu Ming <ov...@sina.com>
Authored: Sun Jan 14 02:43:21 2018 +0000
Committer: Liu Ming <ov...@sina.com>
Committed: Sun Jan 14 02:43:21 2018 +0000
----------------------------------------------------------------------
DISCLAIMER | 12 -----
Makefile | 14 +++---
README | 10 ++--
README.md | 8 +--
core/Makefile | 2 +-
core/conn/Makefile | 7 +--
core/conn/jdbcT4/pom.xml | 6 +--
core/sqf/.gitignore | 2 -
core/sqf/Makefile | 12 ++---
core/sqf/sql/scripts/install_apache_hadoop | 4 +-
core/sql/exp/exp_conv.cpp | 2 +-
core/trafodion.spec | 2 +-
docs/client_install/pom.xml | 26 +++++-----
.../src/asciidoc/_chapters/introduction.adoc | 2 +-
.../src/asciidoc/_chapters/jdbct4.adoc | 2 +-
.../src/asciidoc/_chapters/preparation.adoc | 11 ++---
.../src/asciidoc/_chapters/sample_prog.adoc | 6 +--
docs/command_interface/pom.xml | 22 ++++-----
docs/cqd_reference/pom.xml | 22 ++++-----
docs/jdbct4ref_guide/pom.xml | 22 ++++-----
docs/load_transform/pom.xml | 22 ++++-----
docs/messages_guide/pom.xml | 22 ++++-----
docs/odb_user/pom.xml | 22 ++++-----
docs/provisioning_guide/pom.xml | 26 +++++-----
.../src/asciidoc/_chapters/about.adoc | 2 +-
.../src/asciidoc/_chapters/enable_security.adoc | 4 +-
.../src/asciidoc/_chapters/introduction.adoc | 4 +-
.../src/asciidoc/_chapters/quickstart.adoc | 22 ++++-----
.../src/asciidoc/_chapters/script_install.adoc | 10 ++--
.../src/asciidoc/_chapters/script_remove.adoc | 2 +-
.../src/asciidoc/_chapters/script_upgrade.adoc | 6 +--
docs/shared/license.txt | 5 --
docs/spj_guide/pom.xml | 22 ++++-----
.../src/asciidoc/_chapters/deploy_spjs.adoc | 2 +-
.../src/resources/source/Inventory.java | 6 +--
.../spj_guide/src/resources/source/Payroll.java | 8 +--
docs/spj_guide/src/resources/source/Sales.java | 12 ++---
.../src/resources/source/adjustSalary.java | 2 +-
.../src/resources/source/employeeJob.java | 2 +-
.../src/resources/source/lowerPrice.java | 2 +-
.../src/resources/source/numDailyOrders.java | 2 +-
.../src/resources/source/numMonthlyOrders.java | 2 +-
.../src/resources/source/orderSummary.java | 2 +-
.../src/resources/source/partData.java | 2 +-
.../src/resources/source/partLocations.java | 2 +-
.../src/resources/source/projectTeam.java | 2 +-
.../src/resources/source/supplierInfo.java | 2 +-
.../src/resources/source/supplyQuantities.java | 2 +-
.../src/resources/source/topSalesReps.java | 2 +-
.../src/resources/source/totalPrice.java | 2 +-
docs/sql_reference/pom.xml | 22 ++++-----
docs/src/site/markdown/download.md | 2 +-
.../site/markdown/enable-secure-trafodion.md | 2 +-
docs/src/site/markdown/index.md | 10 ++--
docs/src/site/markdown/ldapcheck.md | 2 +-
docs/src/site/markdown/ldapconfigcheck.md | 2 +-
docs/src/site/markdown/quickstart.md | 6 +--
docs/src/site/markdown/release-notes-1-0-1.md | 2 +-
docs/src/site/site.xml | 10 ++--
install/.gitignore | 1 -
install/Makefile | 7 +--
install/ambari-installer/Makefile | 6 +--
install/ambari-installer/traf_ambari.spec | 2 +-
licenses/Makefile | 5 +-
licenses/lic-server-src | 32 ++++++------
licenses/lic-test-src | 6 +--
pom.xml | 52 ++++++++++----------
tools/docker/Dockerfile | 4 +-
tools/docker/start-compile-docker.sh | 6 +--
69 files changed, 275 insertions(+), 321 deletions(-)
----------------------------------------------------------------------
[21/32] trafodion git commit: [TRAFODION-2857] Web-site changes to
remove incubating status
Posted by li...@apache.org.
[TRAFODION-2857] Web-site changes to remove incubating status
Project status and URL changes.
Email lists and git repo name changes still to come based on infra changes.
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/f077620a
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/f077620a
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/f077620a
Branch: refs/heads/master
Commit: f077620ae434bfdc115a599a591bec1f5eb7bff6
Parents: 3254cc1
Author: Steve Varnau <st...@esgyn.com>
Authored: Fri Dec 22 19:23:57 2017 +0000
Committer: Steve Varnau <st...@esgyn.com>
Committed: Thu Jan 11 18:15:36 2018 +0000
----------------------------------------------------------------------
README | 8 ++---
README.md | 6 ++--
docs/client_install/pom.xml | 16 +++++-----
.../src/asciidoc/_chapters/introduction.adoc | 2 +-
.../src/asciidoc/_chapters/jdbct4.adoc | 2 +-
.../src/asciidoc/_chapters/preparation.adoc | 7 ++---
.../src/asciidoc/_chapters/sample_prog.adoc | 6 ++--
docs/command_interface/pom.xml | 12 ++++----
docs/cqd_reference/pom.xml | 12 ++++----
docs/jdbct4ref_guide/pom.xml | 12 ++++----
docs/load_transform/pom.xml | 12 ++++----
docs/messages_guide/pom.xml | 12 ++++----
docs/odb_user/pom.xml | 12 ++++----
docs/provisioning_guide/pom.xml | 16 +++++-----
.../src/asciidoc/_chapters/about.adoc | 2 +-
.../src/asciidoc/_chapters/enable_security.adoc | 4 +--
.../src/asciidoc/_chapters/introduction.adoc | 4 +--
.../src/asciidoc/_chapters/quickstart.adoc | 22 +++++++-------
.../src/asciidoc/_chapters/script_install.adoc | 10 +++---
.../src/asciidoc/_chapters/script_remove.adoc | 2 +-
.../src/asciidoc/_chapters/script_upgrade.adoc | 6 ++--
docs/shared/license.txt | 5 ---
docs/spj_guide/pom.xml | 12 ++++----
.../src/asciidoc/_chapters/deploy_spjs.adoc | 2 +-
.../src/resources/source/Inventory.java | 6 ++--
.../spj_guide/src/resources/source/Payroll.java | 8 ++---
docs/spj_guide/src/resources/source/Sales.java | 12 ++++----
.../src/resources/source/adjustSalary.java | 2 +-
.../src/resources/source/employeeJob.java | 2 +-
.../src/resources/source/lowerPrice.java | 2 +-
.../src/resources/source/numDailyOrders.java | 2 +-
.../src/resources/source/numMonthlyOrders.java | 2 +-
.../src/resources/source/orderSummary.java | 2 +-
.../src/resources/source/partData.java | 2 +-
.../src/resources/source/partLocations.java | 2 +-
.../src/resources/source/projectTeam.java | 2 +-
.../src/resources/source/supplierInfo.java | 2 +-
.../src/resources/source/supplyQuantities.java | 2 +-
.../src/resources/source/topSalesReps.java | 2 +-
.../src/resources/source/totalPrice.java | 2 +-
docs/sql_reference/pom.xml | 12 ++++----
docs/src/site/markdown/index.md | 10 +++---
docs/src/site/markdown/ldapcheck.md | 2 +-
docs/src/site/markdown/ldapconfigcheck.md | 2 +-
docs/src/site/markdown/quickstart.md | 4 +--
docs/src/site/site.xml | 10 ++----
install/ambari-installer/traf_ambari.spec | 2 +-
licenses/lic-server-src | 32 ++++++++++----------
licenses/lic-test-src | 6 ++--
pom.xml | 8 ++---
tools/docker/Dockerfile | 2 +-
51 files changed, 167 insertions(+), 179 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/README
----------------------------------------------------------------------
diff --git a/README b/README
index 8351595..a8264c0 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-******************************* Apache Trafodion (incubating) **************************
+******************************* Apache Trafodion **************************
Apache Trafodion is a webscale SQL-on-Hadoop solution enabling transactional or
operational workloads on Hadoop. The name "Trafodion" (the Welsh word for
@@ -13,16 +13,16 @@ To get started using Apache Trafodion:
- documentation for this release can be viewed on the Apache Trafodion
wiki page:
- http://trafodion.incubator.apache.org/documentation.html
+ http://trafodion.apache.org/documentation.html
- release notes describing changes for particular releases can be viewed:
http://trafodion.apache.org/release-notes.html
- - the latest Apache Trafodion can be downloaded from Apache incubator
+ - the latest Apache Trafodion can be downloaded from Apache
distribution site or accessed from git
- download site:
- https://dist.apache.org/repos/dist/release/incubator/trafodion
+ https://dist.apache.org/repos/dist/release/trafodion
- git site:
git@github.com:apache/incubator-trafodion
http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 3b93d2c..fb84714 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Apache Trafodion (incubating)
+# Apache Trafodion
Apache Trafodion is a webscale SQL-on-Hadoop solution enabling transactional or
@@ -20,11 +20,11 @@ Hadoop.
http://trafodion.apache.org/release-notes.html
- - the latest Apache Trafodion can be downloaded from Apache incubator
+ - the latest Apache Trafodion can be downloaded from Apache
distribution site or accessed from git:
- download site:
- https://dist.apache.org/repos/dist/release/incubator/trafodion
+ https://dist.apache.org/repos/dist/release/trafodion
- git site:
`git@github.com:apache/incubator-trafodion`
http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/docs/client_install/pom.xml
----------------------------------------------------------------------
diff --git a/docs/client_install/pom.xml b/docs/client_install/pom.xml
index 7d6d122..bb75de5 100644
--- a/docs/client_install/pom.xml
+++ b/docs/client_install/pom.xml
@@ -30,7 +30,7 @@
<packaging>pom</packaging>
<name>Trafodion Client Installation Guide</name>
<description>This guide describes how to install different Trafodion client applications.</description>
- <url>http://trafodion.incubator.apache.org</url>
+ <url>http://trafodion.apache.org</url>
<inceptionYear>2015</inceptionYear>
<parent>
@@ -188,8 +188,8 @@
<project-name>Trafodion</project-name>
<project-logo>${basedir}/../shared/trafodion-logo.jpg</project-logo>
<project-support>user@trafodion.incubator.apache.org</project-support>
- <docs-url>http://trafodion.incubator.apache.org/docs</docs-url>
- <download-url>http://trafodion.incubator.apache.org/download.html</download-url>
+ <docs-url>http://trafodion.apache.org/docs</docs-url>
+ <download-url>http://trafodion.apache.org/download.html</download-url>
<build-date>${maven.build.timestamp}</build-date>
<google-analytics-account>UA-72491210-1</google-analytics-account>
</attributes>
@@ -218,8 +218,8 @@
<project-name>Trafodion</project-name>
<project-logo>${basedir}/../shared/trafodion-logo.jpg</project-logo>
<project-support>user@trafodion.incubator.apache.org</project-support>
- <docs-url>http://trafodion.incubator.apache.org/docs</docs-url>
- <download-url>http://http://trafodion.incubator.apache.org/download.html</download-url>
+ <docs-url>http://trafodion.apache.org/docs</docs-url>
+ <download-url>http://http://trafodion.apache.org/download.html</download-url>
<build-date>${maven.build.timestamp}</build-date>
</attributes>
</configuration>
@@ -289,9 +289,9 @@
<distributionManagement>
<site>
- <id>trafodion.incubator.apache.org</id>
- <name>Trafodion Website at incubator.apache.org</name>
- <!-- On why this is the tmp dir and not trafodion.incubator.apache.org, see
+ <id>trafodion.apache.org</id>
+ <name>Trafodion Website at apache.org</name>
+ <!-- On why this is the tmp dir and not trafodion.apache.org, see
https://issues.apache.org/jira/browse/HBASE-7593?focusedCommentId=13555866&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-13555866
-->
<url>file:///tmp</url>
http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/docs/client_install/src/asciidoc/_chapters/introduction.adoc
----------------------------------------------------------------------
diff --git a/docs/client_install/src/asciidoc/_chapters/introduction.adoc b/docs/client_install/src/asciidoc/_chapters/introduction.adoc
index 4b9172e..4a3c654 100644
--- a/docs/client_install/src/asciidoc/_chapters/introduction.adoc
+++ b/docs/client_install/src/asciidoc/_chapters/introduction.adoc
@@ -38,7 +38,7 @@ The following table lists JDBC-based clients supported by {project-name}.
*NOTE:* The {project-name} Command Interface (trafci), DBVisualizer, and SQuirreL SQL Client require this driver to be installed on the client
workstation.
| *{project-name} Command Interface (trafci)* | A command-line interface that allows you to connect to a {project-name} database and run SQL statements and other commands interactively or from
-script files. For more information, see the http://trafodion.incubator.apache.org/docs/command_interface/index.html[{project-name} Command Interface Guide].
+script files. For more information, see the http://trafodion.apache.org/docs/command_interface/index.html[{project-name} Command Interface Guide].
| *DBVisualizer* | A third-party database tool that allows you to connect to a {project-name} database. For more information, see the http://www.dbvis.com/[DbVisualizer website].
| *SQuirreL SQL Client* | A third-party database tool that allows you to connect to a {project-name} database. For more information, see the
http://squirrel-sql.sourceforge.net/[SQuirreL SQL Client website].
http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/docs/client_install/src/asciidoc/_chapters/jdbct4.adoc
----------------------------------------------------------------------
diff --git a/docs/client_install/src/asciidoc/_chapters/jdbct4.adoc b/docs/client_install/src/asciidoc/_chapters/jdbct4.adoc
index 43dbf73..3b73d14 100644
--- a/docs/client_install/src/asciidoc/_chapters/jdbct4.adoc
+++ b/docs/client_install/src/asciidoc/_chapters/jdbct4.adoc
@@ -92,7 +92,7 @@ Set these values for your environment:
`<port-number>` is the location where the
{project-name} Database Connectivity Service (DCS) is running. (Default: *23400*).
-See the http://trafodion.incubator.apache.org/docs/dcs_reference/index.html[{project-name} Database Connectivity Services Reference Guide]
+See the http://trafodion.apache.org/docs/dcs_reference/index.html[{project-name} Database Connectivity Services Reference Guide]
for information about how to configure the DCS port.
*Example*
http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/docs/client_install/src/asciidoc/_chapters/preparation.adoc
----------------------------------------------------------------------
diff --git a/docs/client_install/src/asciidoc/_chapters/preparation.adoc b/docs/client_install/src/asciidoc/_chapters/preparation.adoc
index 90b9ebb..d042017 100644
--- a/docs/client_install/src/asciidoc/_chapters/preparation.adoc
+++ b/docs/client_install/src/asciidoc/_chapters/preparation.adoc
@@ -103,7 +103,6 @@ The {project-name} Client binaries are in the `clients` folder, which contains t
[cols="30%,70%", options="header"]
|===
| File | Usage
-| `DISCLAIMER` | {project-name} Apache incubation disclaimer.
| `JDBCT4.zip` | {project-name} JDBC Type 4 Driver.
| `LICENCE` | Apache license.
| `NOTICE` | Apache notice.
@@ -166,7 +165,7 @@ using the URL you copied in step 3 above.
$ mkdir $HOME/trafodion
$ cd $HOME/trafodion
$ wget <link to package>
-$ tar -xzvf apache-trafodion_clients-*-incubating.tar.gz
+$ tar -xzvf apache-trafodion_clients-*.tar.gz
$ cd clients
$ ls
DISCLAIMER LICENSE odb64_linux.tar.gz TRAF_ODBC_Linux_Driver_64.tar.gz
@@ -220,7 +219,7 @@ $ unzip trafci.zip -d $HOME/trafodion/trafci
.
$ cd ..
$ ls
-apache-trafodion_clients-2.0.1-incubating.tar.gz clients jdbct4 trafci
+apache-trafodion_clients-2.2.0.tar.gz clients jdbct4 trafci
$
```
@@ -258,7 +257,7 @@ $ tar -xzvf odb64_linux.tar.gz -C $HOME/trafodion/odb
.
$ cd ..
$ ls
-apache-trafodion_clients-2.0.1-incubating.tar.gz clients odb odbc
+apache-trafodion_clients-2.2.0.tar.gz clients odb odbc
```
http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/docs/client_install/src/asciidoc/_chapters/sample_prog.adoc
----------------------------------------------------------------------
diff --git a/docs/client_install/src/asciidoc/_chapters/sample_prog.adoc b/docs/client_install/src/asciidoc/_chapters/sample_prog.adoc
index 2562319..ab22ca8 100644
--- a/docs/client_install/src/asciidoc/_chapters/sample_prog.adoc
+++ b/docs/client_install/src/asciidoc/_chapters/sample_prog.adoc
@@ -34,7 +34,7 @@ Copy and paste the code from this appendix into the recommended files. To build
=== `basicsql.cpp` Source Code
You can download the `basicsql.cpp` example from
-http://trafodion.incubator.apache.org/docs/client_install/resources/source/basicsql.cpp.
+http://trafodion.apache.org/docs/client_install/resources/source/basicsql.cpp.
Alternatively, copy and paste the following code into a file named `basicsql.cpp`:
@@ -52,7 +52,7 @@ see the instructions in <<win_odbc_run_basicsql, Run Sample Program (`basicsql`)
==== `build.bat` (Build Script)
You can download the `build.bat` example from
-http://trafodion.incubator.apache.org/docs/client_install/resources/source/build.bat.
+http://trafodion.apache.org/docs/client_install/resources/source/build.bat.
Alternatively, copy and paste the following code into a file named `build.bat`, which is used to build the sample program on Windows:
@@ -64,7 +64,7 @@ To build the sample program on Windows, see the instructions in <<win_odbc_run_b
==== Run `run.bat`
You can download the `run.bat` example from
-http://trafodion.incubator.apache.org/docs/client_install/resources/source/run.bat.
+http://trafodion.apache.org/docs/client_install/resources/source/run.bat.
Alternatively, copy and paste the following code into a file named `run.bat`, which is used to run the sample program on Windows:
http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/docs/command_interface/pom.xml
----------------------------------------------------------------------
diff --git a/docs/command_interface/pom.xml b/docs/command_interface/pom.xml
index 064ac1d..9eba1d6 100644
--- a/docs/command_interface/pom.xml
+++ b/docs/command_interface/pom.xml
@@ -30,7 +30,7 @@
<packaging>pom</packaging>
<name>Trafodion Command Interface Guide</name>
<description>This guide describes how to use the Trafodion Command Interface (TrafCI).</description>
- <url>http://trafodion.incubator.apache.org</url>
+ <url>http://trafodion.apache.org</url>
<inceptionYear>2015</inceptionYear>
<parent>
@@ -188,7 +188,7 @@
<project-name>Trafodion</project-name>
<project-logo>${basedir}/../shared/trafodion-logo.jpg</project-logo>
<project-support>user@trafodion.incubator.apache.org</project-support>
- <docs-url>http://trafodion.incubator.apache.org/docs</docs-url>
+ <docs-url>http://trafodion.apache.org/docs</docs-url>
<build-date>${maven.build.timestamp}</build-date>
<google-analytics-account>UA-72491210-1</google-analytics-account>
</attributes>
@@ -210,7 +210,7 @@
<project-name>Trafodion</project-name>
<project-logo>${basedir}/../shared/trafodion-logo.jpg</project-logo>
<project-support>user@trafodion.incubator.apache.org</project-support>
- <docs-url>http://trafodion.incubator.apache.org/docs</docs-url>
+ <docs-url>http://trafodion.apache.org/docs</docs-url>
<build-date>${maven.build.timestamp}</build-date>
<pdf-stylesdir>${basedir}/../shared</pdf-stylesdir>
<pdf-style>trafodion</pdf-style>
@@ -287,9 +287,9 @@
<distributionManagement>
<site>
- <id>trafodion.incubator.apache.org</id>
- <name>Trafodion Website at incubator.apache.org</name>
- <!-- On why this is the tmp dir and not trafodion.incubator.apache.org, see
+ <id>trafodion.apache.org</id>
+ <name>Trafodion Website at apache.org</name>
+ <!-- On why this is the tmp dir and not trafodion.apache.org, see
https://issues.apache.org/jira/browse/HBASE-7593?focusedCommentId=13555866&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-13555866
-->
<url>file:///tmp</url>
http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/docs/cqd_reference/pom.xml
----------------------------------------------------------------------
diff --git a/docs/cqd_reference/pom.xml b/docs/cqd_reference/pom.xml
index e84a495..2247918 100644
--- a/docs/cqd_reference/pom.xml
+++ b/docs/cqd_reference/pom.xml
@@ -32,7 +32,7 @@
<description>
This guide describes Trafodion Control Query Defaults (CQDs) that are used to override system-level default settings.
</description>
- <url>http://trafodion.incubator.apache.org</url>
+ <url>http://trafodion.apache.org</url>
<inceptionYear>2015</inceptionYear>
<parent>
@@ -190,7 +190,7 @@
<project-name>Trafodion</project-name>
<project-logo>${basedir}/../shared/trafodion-logo.jpg</project-logo>
<project-support>user@trafodion.incubator.apache.org</project-support>
- <docs-url>http://trafodion.incubator.apache.org/docs</docs-url>
+ <docs-url>http://trafodion.apache.org/docs</docs-url>
<build-date>${maven.build.timestamp}</build-date>
<google-analytics-account>UA-72491210-1</google-analytics-account>
</attributes>
@@ -212,7 +212,7 @@
<project-name>Trafodion</project-name>
<project-logo>${basedir}/../shared/trafodion-logo.jpg</project-logo>
<project-support>user@trafodion.incubator.apache.org</project-support>
- <docs-url>http://trafodion.incubator.apache.org/docs</docs-url>
+ <docs-url>http://trafodion.apache.org/docs</docs-url>
<build-date>${maven.build.timestamp}</build-date>
<pdf-stylesdir>${basedir}/../shared</pdf-stylesdir>
<pdf-style>trafodion</pdf-style>
@@ -289,9 +289,9 @@
<distributionManagement>
<site>
- <id>trafodion.incubator.apache.org</id>
- <name>Trafodion Website at incubator.apache.org</name>
- <!-- On why this is the tmp dir and not trafodion.incubator.apache.org, see
+ <id>trafodion.apache.org</id>
+ <name>Trafodion Website at apache.org</name>
+ <!-- On why this is the tmp dir and not trafodion.apache.org, see
https://issues.apache.org/jira/browse/HBASE-7593?focusedCommentId=13555866&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-13555866
-->
<url>file:///tmp</url>
http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/docs/jdbct4ref_guide/pom.xml
----------------------------------------------------------------------
diff --git a/docs/jdbct4ref_guide/pom.xml b/docs/jdbct4ref_guide/pom.xml
index b5fdcd7..6f9a6fa 100644
--- a/docs/jdbct4ref_guide/pom.xml
+++ b/docs/jdbct4ref_guide/pom.xml
@@ -30,7 +30,7 @@
<packaging>pom</packaging>
<name>Trafodion JDBC Type 4 Programmer's Reference Guide</name>
<description>This document describes how to use the JDBC Type 4 Driver.</description>
- <url>http://trafodion.incubator.apache.org</url>
+ <url>http://trafodion.apache.org</url>
<inceptionYear>2015</inceptionYear>
<parent>
@@ -188,7 +188,7 @@
<project-name>Trafodion</project-name>
<project-logo>${basedir}/../shared/trafodion-logo.jpg</project-logo>
<project-support>user@trafodion.incubator.apache.org</project-support>
- <docs-url>http://trafodion.incubator.apache.org/docs</docs-url>
+ <docs-url>http://trafodion.apache.org/docs</docs-url>
<build-date>${maven.build.timestamp}</build-date>
<google-analytics-account>UA-72491210-1</google-analytics-account>
</attributes>
@@ -217,7 +217,7 @@
<project-name>Trafodion</project-name>
<project-logo>${basedir}/../shared/trafodion-logo.jpg</project-logo>
<project-support>user@trafodion.incubator.apache.org</project-support>
- <docs-url>http://trafodion.incubator.apache.org/docs</docs-url>
+ <docs-url>http://trafodion.apache.org/docs</docs-url>
<build-date>${maven.build.timestamp}</build-date>
</attributes>
</configuration>
@@ -287,9 +287,9 @@
<distributionManagement>
<site>
- <id>trafodion.incubator.apache.org</id>
- <name>Trafodion Website at incubator.apache.org</name>
- <!-- On why this is the tmp dir and not trafodion.incubator.apache.org, see
+ <id>trafodion.apache.org</id>
+ <name>Trafodion Website at apache.org</name>
+ <!-- On why this is the tmp dir and not trafodion.apache.org, see
https://issues.apache.org/jira/browse/HBASE-7593?focusedCommentId=13555866&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-13555866
-->
<url>file:///tmp</url>
http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/docs/load_transform/pom.xml
----------------------------------------------------------------------
diff --git a/docs/load_transform/pom.xml b/docs/load_transform/pom.xml
index 26eaa5c..2b7b379 100644
--- a/docs/load_transform/pom.xml
+++ b/docs/load_transform/pom.xml
@@ -30,7 +30,7 @@
<packaging>pom</packaging>
<name>Trafodion Load and Transform Guide</name>
<description>This guide describes how to load and transform data into Trafodion.</description>
- <url>http://trafodion.incubator.apache.org</url>
+ <url>http://trafodion.apache.org</url>
<inceptionYear>2015</inceptionYear>
<parent>
@@ -188,7 +188,7 @@
<project-name>Trafodion</project-name>
<project-logo>${basedir}/../shared/trafodion-logo.jpg</project-logo>
<project-support>user@trafodion.incubator.apache.org</project-support>
- <docs-url>http://trafodion.incubator.apache.org/docs</docs-url>
+ <docs-url>http://trafodion.apache.org/docs</docs-url>
<build-date>${maven.build.timestamp}</build-date>
<google-analytics-account>UA-72491210-1</google-analytics-account>
</attributes>
@@ -210,7 +210,7 @@
<project-name>Trafodion</project-name>
<project-logo>${basedir}/../shared/trafodion-logo.jpg</project-logo>
<project-support>user@trafodion.incubator.apache.org</project-support>
- <docs-url>http://trafodion.incubator.apache.org/docs</docs-url>
+ <docs-url>http://trafodion.apache.org/docs</docs-url>
<build-date>${maven.build.timestamp}</build-date>
<pdf-stylesdir>${basedir}/../shared</pdf-stylesdir>
<pdf-style>trafodion</pdf-style>
@@ -287,9 +287,9 @@
<distributionManagement>
<site>
- <id>trafodion.incubator.apache.org</id>
- <name>Trafodion Website at incubator.apache.org</name>
- <!-- On why this is the tmp dir and not trafodion.incubator.apache.org, see
+ <id>trafodion.apache.org</id>
+ <name>Trafodion Website at apache.org</name>
+ <!-- On why this is the tmp dir and not trafodion.apache.org, see
https://issues.apache.org/jira/browse/HBASE-7593?focusedCommentId=13555866&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-13555866
-->
<url>file:///tmp</url>
http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/docs/messages_guide/pom.xml
----------------------------------------------------------------------
diff --git a/docs/messages_guide/pom.xml b/docs/messages_guide/pom.xml
index 4a4b0dd..20f1a47 100644
--- a/docs/messages_guide/pom.xml
+++ b/docs/messages_guide/pom.xml
@@ -30,7 +30,7 @@
<packaging>pom</packaging>
<name>Trafodion Messages Guide</name>
<description>This guide describes user-visible messages produced by Trafodion.</description>
- <url>http://trafodion.incubator.apache.org</url>
+ <url>http://trafodion.apache.org</url>
<inceptionYear>2015</inceptionYear>
<parent>
@@ -187,7 +187,7 @@
<project-name>Trafodion</project-name>
<project-logo>${basedir}/../shared/trafodion-logo.jpg</project-logo>
<project-support>user@trafodion.incubator.apache.org</project-support>
- <docs-url>http://trafodion.incubator.apache.org/docs</docs-url>
+ <docs-url>http://trafodion.apache.org/docs</docs-url>
<build-date>${maven.build.timestamp}</build-date>
<google-analytics-account>UA-72491210-1</google-analytics-account>
</attributes>
@@ -209,7 +209,7 @@
<project-name>Trafodion</project-name>
<project-logo>${basedir}/../shared/trafodion-logo.jpg</project-logo>
<project-support>user@trafodion.incubator.apache.org</project-support>
- <docs-url>http://trafodion.incubator.apache.org/docs</docs-url>
+ <docs-url>http://trafodion.apache.org/docs</docs-url>
<build-date>${maven.build.timestamp}</build-date>
<pdf-stylesdir>${basedir}/../shared</pdf-stylesdir>
<pdf-style>trafodion</pdf-style>
@@ -286,9 +286,9 @@
<distributionManagement>
<site>
- <id>trafodion.incubator.apache.org</id>
- <name>Trafodion Website at incubator.apache.org</name>
- <!-- On why this is the tmp dir and not trafodion.incubator.apache.org, see
+ <id>trafodion.apache.org</id>
+ <name>Trafodion Website at apache.org</name>
+ <!-- On why this is the tmp dir and not trafodion.apache.org, see
https://issues.apache.org/jira/browse/HBASE-7593?focusedCommentId=13555866&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-13555866
-->
<url>file:///tmp</url>
http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/docs/odb_user/pom.xml
----------------------------------------------------------------------
diff --git a/docs/odb_user/pom.xml b/docs/odb_user/pom.xml
index f8de8fa..0227708 100644
--- a/docs/odb_user/pom.xml
+++ b/docs/odb_user/pom.xml
@@ -30,7 +30,7 @@
<packaging>pom</packaging>
<name>Trafodion odb User Guide</name>
<description>This guide describes how to odb, a multi-threaded, ODBC-based command-line tool, to perform various operations on a Trafodion database.</description>
- <url>http://trafodion.incubator.apache.org</url>
+ <url>http://trafodion.apache.org</url>
<inceptionYear>2015</inceptionYear>
<parent>
<groupId>org.apache.trafodion</groupId>
@@ -187,7 +187,7 @@
<project-name>Trafodion</project-name>
<project-logo>${basedir}/../shared/trafodion-logo.jpg</project-logo>
<project-support>user@trafodion.incubator.apache.org</project-support>
- <docs-url>http://trafodion.incubator.apache.org/docs</docs-url>
+ <docs-url>http://trafodion.apache.org/docs</docs-url>
<build-date>${maven.build.timestamp}</build-date>
<google-analytics-account>UA-72491210-1</google-analytics-account>
</attributes>
@@ -209,7 +209,7 @@
<project-name>Trafodion</project-name>
<project-logo>${basedir}/../shared/trafodion-logo.jpg</project-logo>
<project-support>user@trafodion.incubator.apache.org</project-support>
- <docs-url>http://trafodion.incubator.apache.org/docs</docs-url>
+ <docs-url>http://trafodion.apache.org/docs</docs-url>
<build-date>${maven.build.timestamp}</build-date>
<pdf-stylesdir>${basedir}/../shared</pdf-stylesdir>
<pdf-style>trafodion</pdf-style>
@@ -286,9 +286,9 @@
<distributionManagement>
<site>
- <id>trafodion.incubator.apache.org</id>
- <name>Trafodion Website at incubator.apache.org</name>
- <!-- On why this is the tmp dir and not trafodion.incubator.apache.org, see
+ <id>trafodion.apache.org</id>
+ <name>Trafodion Website at apache.org</name>
+ <!-- On why this is the tmp dir and not trafodion.apache.org, see
https://issues.apache.org/jira/browse/HBASE-7593?focusedCommentId=13555866&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-13555866
-->
<url>file:///tmp</url>
http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/docs/provisioning_guide/pom.xml
----------------------------------------------------------------------
diff --git a/docs/provisioning_guide/pom.xml b/docs/provisioning_guide/pom.xml
index b48f592..b6ee0d8 100644
--- a/docs/provisioning_guide/pom.xml
+++ b/docs/provisioning_guide/pom.xml
@@ -30,7 +30,7 @@
<packaging>pom</packaging>
<name>Trafodion Provisioning Guide</name>
<description>This guide describes how to provision Trafodion.</description>
- <url>http://trafodion.incubator.apache.org</url>
+ <url>http://trafodion.apache.org</url>
<inceptionYear>2015</inceptionYear>
<parent>
@@ -188,8 +188,8 @@
<project-name>Trafodion</project-name>
<project-logo>${basedir}/../shared/trafodion-logo.jpg</project-logo>
<project-support>user@trafodion.incubator.apache.org</project-support>
- <docs-url>http://trafodion.incubator.apache.org/docs</docs-url>
- <download-url>http://trafodion.incubator.apache.org/download.html</download-url>
+ <docs-url>http://trafodion.apache.org/docs</docs-url>
+ <download-url>http://trafodion.apache.org/download.html</download-url>
<build-date>${maven.build.timestamp}</build-date>
<google-analytics-account>UA-72491210-1</google-analytics-account>
</attributes>
@@ -211,8 +211,8 @@
<project-name>Trafodion</project-name>
<project-logo>${basedir}/../shared/trafodion-logo.jpg</project-logo>
<project-support>user@trafodion.incubator.apache.org</project-support>
- <docs-url>http://trafodion.incubator.apache.org/docs</docs-url>
- <download-url>http://trafodion.incubator.apache.org/download.html</download-url>
+ <docs-url>http://trafodion.apache.org/docs</docs-url>
+ <download-url>http://trafodion.apache.org/download.html</download-url>
<build-date>${maven.build.timestamp}</build-date>
<pdf-stylesdir>${basedir}/../shared</pdf-stylesdir>
<pdf-style>trafodion</pdf-style>
@@ -289,9 +289,9 @@
<distributionManagement>
<site>
- <id>trafodion.incubator.apache.org</id>
- <name>Trafodion Website at incubator.apache.org</name>
- <!-- On why this is the tmp dir and not trafodion.incubator.apache.org, see
+ <id>trafodion.apache.org</id>
+ <name>Trafodion Website at apache.org</name>
+ <!-- On why this is the tmp dir and not trafodion.apache.org, see
https://issues.apache.org/jira/browse/HBASE-7593?focusedCommentId=13555866&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-13555866
-->
<url>file:///tmp</url>
http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/docs/provisioning_guide/src/asciidoc/_chapters/about.adoc
----------------------------------------------------------------------
diff --git a/docs/provisioning_guide/src/asciidoc/_chapters/about.adoc b/docs/provisioning_guide/src/asciidoc/_chapters/about.adoc
index ddce5bf..a98cad3 100644
--- a/docs/provisioning_guide/src/asciidoc/_chapters/about.adoc
+++ b/docs/provisioning_guide/src/asciidoc/_chapters/about.adoc
@@ -28,7 +28,7 @@ This guide describes how to provision the end-user {project-name} binaries on to
(see {docs-url}/client_install/index.html[{project-name} Client Installation Guide]) or via application code you write.
If you want to install a Trafodion developer-build environment, then please refer to the
-http://trafodion.incubator.apache.org/contributing-redirect.html[Trafodion Contributor Guide] for instructions.
+http://trafodion.apache.org/contributing-redirect.html[Trafodion Contributor Guide] for instructions.
== Intended Audience
This guide assumes that you are well-versed in Linux and Hadoop administration. If you don't have such experience, then
http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/docs/provisioning_guide/src/asciidoc/_chapters/enable_security.adoc
----------------------------------------------------------------------
diff --git a/docs/provisioning_guide/src/asciidoc/_chapters/enable_security.adoc b/docs/provisioning_guide/src/asciidoc/_chapters/enable_security.adoc
index df6ced7..e315f72 100644
--- a/docs/provisioning_guide/src/asciidoc/_chapters/enable_security.adoc
+++ b/docs/provisioning_guide/src/asciidoc/_chapters/enable_security.adoc
@@ -495,10 +495,10 @@ Current Environment
----------------------------------
AUTHENTICATION enabled
AUTHORIZATION enabled
-CURRENT DIRECTORY /.../incubator-trafodion/install/installer
+CURRENT DIRECTORY /.../trafodion/install/installer
LIST_COUNT 4294967295
LOG FILE
-MESSAGEFILE /.../incubator-trafodion/core/sqf/export/ ...
+MESSAGEFILE /.../trafodion/core/sqf/export/ ...
MESSAGEFILE LANG US English
MESSAGEFILE VRSN {2016-06-14 22:27 LINUX:host/user}
SQL CATALOG TRAFODION
http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/docs/provisioning_guide/src/asciidoc/_chapters/introduction.adoc
----------------------------------------------------------------------
diff --git a/docs/provisioning_guide/src/asciidoc/_chapters/introduction.adoc b/docs/provisioning_guide/src/asciidoc/_chapters/introduction.adoc
index 67cc082..b16eea3 100644
--- a/docs/provisioning_guide/src/asciidoc/_chapters/introduction.adoc
+++ b/docs/provisioning_guide/src/asciidoc/_chapters/introduction.adoc
@@ -158,7 +158,7 @@ Next, you unpack the tar file.
```
$ mkdir $HOME/trafodion-installer
$ cd $HOME/trafodion-downloads
-$ tar -zxf apache-trafodion-pyinstaller-2.1.0-incubating.tar.gz -C $HOME/trafodion-installer
+$ tar -zxf apache-trafodion-pyinstaller-2.2.0.tar.gz -C $HOME/trafodion-installer
$
```
@@ -268,7 +268,7 @@ that matches the security policies of your organization.
The {project-name} Installer supports a minimum configuration to quick start your installation in two steps.
1. Copy {project-name} server binary file to your installer directory.
```
-cp /path/to/apache-trafodion_server-2.1.0-RH-x86_64-incubating.tar.gz python-installer/
+cp /path/to/apache-trafodion_server-2.2.0-RH-x86_64.tar.gz python-installer/
```
2. Modify configuration file `my_config`, add the Hadoop Distribution Manager URL in `mgr_url`.
```
http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/docs/provisioning_guide/src/asciidoc/_chapters/quickstart.adoc
----------------------------------------------------------------------
diff --git a/docs/provisioning_guide/src/asciidoc/_chapters/quickstart.adoc b/docs/provisioning_guide/src/asciidoc/_chapters/quickstart.adoc
index fbdac4f..c346ee3 100644
--- a/docs/provisioning_guide/src/asciidoc/_chapters/quickstart.adoc
+++ b/docs/provisioning_guide/src/asciidoc/_chapters/quickstart.adoc
@@ -53,31 +53,31 @@ Download the Trafodion Installer and Server binaries:
$ mkdir $HOME/trafodion-download
$ cd $HOME/trafodion-download
$ # Download the Trafodion Installer binaries
-$ wget http://apache.cs.utah.edu/incubator/trafodion/trafodion-2.1.0.incubating/apache-trafodion-pyinstaller-2.1.0-incubating.tar.gz
+$ wget http://apache.cs.utah.edu/trafodion/trafodion-2.2.0/apache-trafodion-pyinstaller-2.2.0.tar.gz
Resolving http://apache.cs.utah.edu... 192.168.1.56
Connecting to http://apache.cs.utah.edu|192.168.1.56|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 68813 (67K) [application/x-gzip]
-Saving to: "apache-trafodion-pyinstaller-2.1.0-incubating.tar.gz"
+Saving to: "apache-trafodion-pyinstaller-2.2.0.tar.gz"
100%[=====================================================================================================================>] 68,813 124K/s in 0.5s
-2016-02-14 04:19:42 (124 KB/s) - "apache-trafodion-pyinstaller-2.1.0-incubating.tar.gz" saved [68813/68813]
+2016-02-14 04:19:42 (124 KB/s) - "apache-trafodion-pyinstaller-2.2.0.tar.gz" saved [68813/68813]
-$ wget http://apache.cs.utah.edu/incubator/trafodion/trafodion-2.1.0.incubating/apache-trafodion_server-2.1.0-RH-x86_64-incubating.tar.gz
+$ wget http://apache.cs.utah.edu/trafodion/trafodion-2.2.0/apache-trafodion_server-2.2.0-RH-x86_64.tar.gz
Resolving http://apache.cs.utah.edu... 192.168.1.56
Connecting to http://apache.cs.utah.edu|192.168.1.56|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 214508243 (205M) [application/x-gzip]
-Saving to: "apache-trafodion_server-2.1.0-RH-x86_64-incubating.tar.gz"
+Saving to: "apache-trafodion_server-2.2.0-RH-x86_64.tar.gz"
100%[=====================================================================================================================>] 214,508,243 3.90M/s in 55s
-2016-02-14 04:22:14 (3.72 MB/s) - "apache-trafodion_server-2.1.0-RH-x86_64-incubating.tar.gz" saved [214508243/214508243]
+2016-02-14 04:22:14 (3.72 MB/s) - "apache-trafodion_server-2.2.0-RH-x86_64.tar.gz" saved [214508243/214508243]
$ ls -l
--rw-rw-r--. 1 centos centos 74237 Feb 13 14:53 apache-trafodion_pyinstaller-2.1.0-incubating.tar.gz
--rw-rw-r--. 1 centos centos 183114066 Feb 10 22:34 apache-trafodion_server-2.1.0-RH-x86_64-incubating.tar.gz
+-rw-rw-r--. 1 centos centos 74237 Feb 13 14:53 apache-trafodion_pyinstaller-2.2.0.tar.gz
+-rw-rw-r--. 1 centos centos 183114066 Feb 10 22:34 apache-trafodion_server-2.2.0-RH-x86_64.tar.gz
$
```
@@ -92,10 +92,10 @@ The first step in the installation process is to unpack the {project-name} Insta
```
$ mkdir $HOME/trafodion-installer
$ cd $HOME/trafodion-downloads
-$ tar -zxf apache-trafodion-pyinstaller-2.1.0-incubating.tar.gz -C $HOME/trafodion-installer
-$ cp -f apache-trafodion_server-2.1.0-RH-x86_64-incubating.tar.gz $HOME/trafodion-installer
+$ tar -zxf apache-trafodion-pyinstaller-2.2.0.tar.gz -C $HOME/trafodion-installer
+$ cp -f apache-trafodion_server-2.2.0-RH-x86_64.tar.gz $HOME/trafodion-installer
$ ls $HOME/trafodion-installer/python-installer
-apache-trafodion_server-2.1.0-RH-x86_64-incubating.tar.gz db_install.py DISCLAIMER LICENSE prettytable.py scripts
+apache-trafodion_server-2.2.0-RH-x86_64.tar.gz db_install.py DISCLAIMER LICENSE prettytable.py scripts
configs db_uninstall.py discovery.py NOTICE README.md
$
```
http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/docs/provisioning_guide/src/asciidoc/_chapters/script_install.adoc
----------------------------------------------------------------------
diff --git a/docs/provisioning_guide/src/asciidoc/_chapters/script_install.adoc b/docs/provisioning_guide/src/asciidoc/_chapters/script_install.adoc
index 65aba51..d5b42e5 100644
--- a/docs/provisioning_guide/src/asciidoc/_chapters/script_install.adoc
+++ b/docs/provisioning_guide/src/asciidoc/_chapters/script_install.adoc
@@ -43,7 +43,7 @@ The first step in the installation process is to unpack the {project-name} Insta
```
$ mkdir $HOME/trafodion-installer
$ cd $HOME/trafodion-downloads
-$ tar -zxf apache-trafodion-pyinstaller-2.1.0-incubating.tar.gz -C $HOME/trafodion-installer
+$ tar -zxf apache-trafodion_pyinstaller-x.x.x.tar.gz -C $HOME/trafodion-installer
$
```
@@ -74,8 +74,8 @@ Confirm Enter HDP/CDH web manager user password:
TASK: Environment Discover ***************************************************************
Time Cost: 0 hour(s) 0 minute(s) 4 second(s)
-Enter full path to Trafodion tar file [/data/python-installer/apache-trafodion_server-2.1.0-RH-x86_64-incubating.tar.gz]:
-Enter directory name to install trafodion to [apache-trafodion-2.1.0]:
+Enter full path to Trafodion tar file [/data/python-installer/apache-trafodion_server-x.x.x-RH-x86_64.tar.gz]:
+Enter directory name to install trafodion to [apache-trafodion-x.x.x]:
Enter trafodion user password:
Confirm Enter trafodion user password:
Enter number of DCS client connections per node [4]:
@@ -102,8 +102,8 @@ Enable DCS High Avalability (Y/N) [N]:
| mgr_user | admin |
| node_list | node-1,node-2 |
| scratch_locs | $TRAF_VAR |
-| traf_dirname | apache-trafodion-2.1.0 |
-| traf_package | /data/python-installer/apache-trafodion_server-2.1.0-RH-x86_64-incubating.tar.gz |
+| traf_dirname | apache-trafodion-x.x.x |
+| traf_package | /data/python-installer/apache-trafodion_server-x.x.x-RH-x86_64.tar.gz |
| traf_start | Y |
| traf_user | trafodion |
+------------------+-----------------------------------------------------------------------------------+
http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/docs/provisioning_guide/src/asciidoc/_chapters/script_remove.adoc
----------------------------------------------------------------------
diff --git a/docs/provisioning_guide/src/asciidoc/_chapters/script_remove.adoc b/docs/provisioning_guide/src/asciidoc/_chapters/script_remove.adoc
index 5ad55a7..b402327 100644
--- a/docs/provisioning_guide/src/asciidoc/_chapters/script_remove.adoc
+++ b/docs/provisioning_guide/src/asciidoc/_chapters/script_remove.adoc
@@ -74,7 +74,7 @@ Issued a 'shutdown normal' request
Shutdown in progress
# of SQ processes: 0
-SQ Shutdown (normal) from /home/trafodion/apache-trafodion-1.3.0-incubating-bin/sql/scripts Successful
+SQ Shutdown (normal) from /home/trafodion/apache-trafodion-2.2.0-bin/sql/scripts Successful
Mon Feb 15 07:49:26 UTC 2016
[trafodion@trafodion-1 scripts]$ exit
[admin@trafodion-1 ~]$
http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/docs/provisioning_guide/src/asciidoc/_chapters/script_upgrade.adoc
----------------------------------------------------------------------
diff --git a/docs/provisioning_guide/src/asciidoc/_chapters/script_upgrade.adoc b/docs/provisioning_guide/src/asciidoc/_chapters/script_upgrade.adoc
index c6a05f6..4eb72a6 100644
--- a/docs/provisioning_guide/src/asciidoc/_chapters/script_upgrade.adoc
+++ b/docs/provisioning_guide/src/asciidoc/_chapters/script_upgrade.adoc
@@ -55,7 +55,7 @@ You unpack the updated {project-name} Installer into a new directory.
```
$ mkdir $HOME/trafodion-installer
$ cd $HOME/trafodion-downloads
-$ tar -zxf apache-trafodion-pyinstaller-2.1.0-incubating.tar.gz -C $HOME/trafodion-installer
+$ tar -zxf apache-trafodion-pyinstaller-2.2.0.tar.gz -C $HOME/trafodion-installer
$
```
@@ -149,13 +149,13 @@ $ cd $HOME/trafodion-configuration
$ cp my_config my_config_2.0
$ # Pre edit content
-traf_package = "/home/centos/trafodion-download/apache-trafodion-2.0.0-incubating.tar.gz"
+traf_package = "/home/centos/trafodion-download/apache-trafodion-2.2.0.tar.gz"
$ # Use your favorite editor to modify my_config_2.0
$ emacs my_config_2.0
$ # Post edit changes
-traf_package = "/home/centos/trafodion-download/apache-trafodion-2.1.0-incubating.tar.gz"
+traf_package = "/home/centos/trafodion-download/apache-trafodion-2.2.0.tar.gz"
```
NOTE: The {project-name} Installer performs the same configuration changes as it does for an installation,
http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/docs/shared/license.txt
----------------------------------------------------------------------
diff --git a/docs/shared/license.txt b/docs/shared/license.txt
index 5808b25..3dd96d1 100644
--- a/docs/shared/license.txt
+++ b/docs/shared/license.txt
@@ -9,8 +9,3 @@ Unless required by applicable law or agreed to in writing, software distributed
"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.
-*Disclaimer:* _Apache Trafodion is an effort undergoing incubation at the Apache Software Foundation (ASF), sponsored by
-the Apache Incubator PMC. Incubation is required of all newly accepted projects until a further review indicates that
-the infrastructure, communications, and decision making process have stabilized in a manner consistent with other
-successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code,
-it does indicate that the project has yet to be fully endorsed by the ASF._
http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/docs/spj_guide/pom.xml
----------------------------------------------------------------------
diff --git a/docs/spj_guide/pom.xml b/docs/spj_guide/pom.xml
index 51f7177..bba8f1e 100644
--- a/docs/spj_guide/pom.xml
+++ b/docs/spj_guide/pom.xml
@@ -30,7 +30,7 @@
<packaging>pom</packaging>
<name>Trafodion SPJ Guide</name>
<description>This guide describes how to develop, deploy, and manage Stored Procedures in Java (SPJs) on the Trafodion database.</description>
- <url>http://trafodion.incubator.apache.org</url>
+ <url>http://trafodion.apache.org</url>
<inceptionYear>2015</inceptionYear>
<parent>
@@ -188,7 +188,7 @@
<project-name>Trafodion</project-name>
<project-logo>${basedir}/../shared/trafodion-logo.jpg</project-logo>
<project-support>user@trafodion.incubator.apache.org</project-support>
- <docs-url>http://trafodion.incubator.apache.org/docs</docs-url>
+ <docs-url>http://trafodion.apache.org/docs</docs-url>
<build-date>${maven.build.timestamp}</build-date>
<google-analytics-account>UA-72491210-1</google-analytics-account>
</attributes>
@@ -217,7 +217,7 @@
<project-name>Trafodion</project-name>
<project-logo>${basedir}/../shared/trafodion-logo.jpg</project-logo>
<project-support>user@trafodion.incubator.apache.org</project-support>
- <docs-url>http://trafodion.incubator.apache.org/docs</docs-url>
+ <docs-url>http://trafodion.apache.org/docs</docs-url>
<build-date>${maven.build.timestamp}</build-date>
</attributes>
</configuration>
@@ -287,9 +287,9 @@
<distributionManagement>
<site>
- <id>trafodion.incubator.apache.org</id>
- <name>Trafodion Website at incubator.apache.org</name>
- <!-- On why this is the tmp dir and not trafodion.incubator.apache.org, see
+ <id>trafodion.apache.org</id>
+ <name>Trafodion Website at apache.org</name>
+ <!-- On why this is the tmp dir and not trafodion.apache.org, see
https://issues.apache.org/jira/browse/HBASE-7593?focusedCommentId=13555866&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-13555866
-->
<url>file:///tmp</url>
http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/docs/spj_guide/src/asciidoc/_chapters/deploy_spjs.adoc
----------------------------------------------------------------------
diff --git a/docs/spj_guide/src/asciidoc/_chapters/deploy_spjs.adoc b/docs/spj_guide/src/asciidoc/_chapters/deploy_spjs.adoc
index 7f55713..23b84aa 100644
--- a/docs/spj_guide/src/asciidoc/_chapters/deploy_spjs.adoc
+++ b/docs/spj_guide/src/asciidoc/_chapters/deploy_spjs.adoc
@@ -66,7 +66,7 @@ Do the following:
+
```
$ # Set up the environmental variables.
-$ cd $HOME/trafodion-incubator
+$ cd $HOME/trafodion
$ source env.sh
$ # Prepare the class jar file
$ cd $HOME/trafodion-spjs
http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/docs/spj_guide/src/resources/source/Inventory.java
----------------------------------------------------------------------
diff --git a/docs/spj_guide/src/resources/source/Inventory.java b/docs/spj_guide/src/resources/source/Inventory.java
index 76c5359..1cfd397 100644
--- a/docs/spj_guide/src/resources/source/Inventory.java
+++ b/docs/spj_guide/src/resources/source/Inventory.java
@@ -7,7 +7,7 @@ public class Inventory
// supplier's name, street, city, state, and post code to separate output
// parameters.
//
- // See http://trafodion.incubator.apache.org/docs/spj_guide/index.html#supplierinfo-procedure
+ // See http://trafodion.apache.org/docs/spj_guide/index.html#supplierinfo-procedure
// for more documentation.
public static void supplierInfo( BigDecimal suppNum
, String[] suppName
@@ -46,7 +46,7 @@ public class Inventory
// quantities of available parts in inventory to separate output
// parameters.
//
- // See http://trafodion.incubator.apache.org/docs/spj_guide/index.html#supplyquantities-procedure
+ // See http://trafodion.apache.org/docs/spj_guide/index.html#supplyquantities-procedure
// for more documentation.
public static void supplyQuantities( int[] avgQty
, int[] minQty
@@ -79,7 +79,7 @@ public class Inventory
// set of location codes that have the exact quantity and a set of location
// codes that have more than that quantity.
//
- // See http://trafodion.incubator.apache.org/docs/spj_guide/index.html#partlocations-procedure
+ // See http://trafodion.apache.org/docs/spj_guide/index.html#partlocations-procedure
// for more documentation.
public static void partLocations( int partNum
, int quantity
http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/docs/spj_guide/src/resources/source/Payroll.java
----------------------------------------------------------------------
diff --git a/docs/spj_guide/src/resources/source/Payroll.java b/docs/spj_guide/src/resources/source/Payroll.java
index 89c28a5..13b8d1c 100644
--- a/docs/spj_guide/src/resources/source/Payroll.java
+++ b/docs/spj_guide/src/resources/source/Payroll.java
@@ -8,7 +8,7 @@ public class Payroll
// percentage. This method also returns the updated salary to an output
// parameter.
//
- // See http://trafodion.incubator.apache.org/docs/spj_guide/index.html#adjustsalary-procedure
+ // See http://trafodion.apache.org/docs/spj_guide/index.html#adjustsalary-procedure
// for more documentation.
public static void adjustSalary( BigDecimal empNum
, double percent
@@ -48,7 +48,7 @@ public class Payroll
// The EMPLOYEEJOB procedure accepts an employee number and returns a job
// code or null value to an output parameter.
//
- // See http://trafodion.incubator.apache.org/docs/spj_guide/index.html#employeejob-procedure
+ // See http://trafodion.apache.org/docs/spj_guide/index.html#employeejob-procedure
// for more documentation.
public static void employeeJob( int empNum
, java.lang.Integer[] jobCode
@@ -82,7 +82,7 @@ public class Payroll
// employee number, first name, last name, and location of the employees
// assigned to that project.
//
- // See http://trafodion.incubator.apache.org/docs/spj_guide/index.html#projectteam-procedure
+ // See http://trafodion.apache.org/docs/spj_guide/index.html#projectteam-procedure
// for more documentation.
public static void projectTeam( int projectCode
, ResultSet[] members
@@ -110,7 +110,7 @@ public class Payroll
// figures of the top five sales representatives who had the highest sales
// (unit_price * qty_ordered) that quarter.
//
- // See http://trafodion.incubator.apache.org/docs/spj_guide/index.html#topsalesreps-procedure
+ // See http://trafodion.apache.org/docs/spj_guide/index.html#topsalesreps-procedure
// for more documentation.
public static void topSalesReps( int whichQuarter
, ResultSet[] topReps
http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/docs/spj_guide/src/resources/source/Sales.java
----------------------------------------------------------------------
diff --git a/docs/spj_guide/src/resources/source/Sales.java b/docs/spj_guide/src/resources/source/Sales.java
index fd47df8..c611ad1 100644
--- a/docs/spj_guide/src/resources/source/Sales.java
+++ b/docs/spj_guide/src/resources/source/Sales.java
@@ -7,7 +7,7 @@ public class Sales
// is, have less than 50 orders) and lowers the price of these items in the
// database by 10 percent.
//
- // See http://trafodion.incubator.apache.org/docs/spj_guide/index.html#lowerprice-procedure
+ // See http://trafodion.apache.org/docs/spj_guide/index.html#lowerprice-procedure
// for more documentation.
public static void lowerPrice() throws SQLException
{
@@ -50,7 +50,7 @@ public class Sales
// The DAILYORDERS procedure accepts a date and returns the number of
//orders on that date to an output parameter.
//
- // See http://trafodion.incubator.apache.org/docs/spj_guide/index.html#dailyorders-procedure
+ // See http://trafodion.apache.org/docs/spj_guide/index.html#dailyorders-procedure
// for additional documenation.
public static void numDailyOrders( Date date
, int[] numOrders
@@ -80,7 +80,7 @@ public class Sales
// The MONTHLYORDERS procedure accepts an integer representing the month
// and returns the number of orders during that month to an output parameter.
//
- // See http://trafodion.incubator.apache.org/docs/spj_guide/index.html#monthlyorders-procedure
+ // See http://trafodion.apache.org/docs/spj_guide/index.html#monthlyorders-procedure
// for more documentation.
public static void numMonthlyOrders( int month
, int[] numOrders
@@ -122,7 +122,7 @@ public class Sales
// of an item, calculates the total price, including tax and shipping
// charges, and returns the total price to an input/output parameter.
//
- // See http://trafodion.incubator.apache.org/docs/spj_guide/index.html#totalprice-procedure
+ // See http://trafodion.apache.org/docs/spj_guide/index.html#totalprice-procedure
// for more documentation.
public static void totalPrice( BigDecimal qtyOrdered
, String shippingSpeed
@@ -175,7 +175,7 @@ public class Sales
// * A result set that contains rows from the PARTSUPP table for suppliers who carry this part.
// * A result set that contains rows from the EMPLOYEE table for sales reps who have sold this part.
//
- // See http://trafodion.incubator.apache.org/docs/spj_guide/index.html#partdata-procedure
+ // See http://trafodion.apache.org/docs/spj_guide/index.html#partdata-procedure
// for more documentation.
public static void partData( int partNum
, String[] partDescription
@@ -281,7 +281,7 @@ public class Sales
// contains fields for the order number, part number, unit price, quantity
// ordered, and part description.
//
- // See http://trafodion.incubator.apache.org/docs/spj_guide/index.html#ordersummary-procedure
+ // See http://trafodion.apache.org/docs/spj_guide/index.html#ordersummary-procedure
// for more documentation.
public static void orderSummary( java.lang.String onOrAfter
, long[] numOrders
http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/docs/spj_guide/src/resources/source/adjustSalary.java
----------------------------------------------------------------------
diff --git a/docs/spj_guide/src/resources/source/adjustSalary.java b/docs/spj_guide/src/resources/source/adjustSalary.java
index cc2b095..46df21c 100644
--- a/docs/spj_guide/src/resources/source/adjustSalary.java
+++ b/docs/spj_guide/src/resources/source/adjustSalary.java
@@ -3,7 +3,7 @@
// percentage. This method also returns the updated salary to an output
// parameter.
//
-// See http://trafodion.incubator.apache.org/docs/spj_guide/index.html#adjustsalary-procedure
+// See http://trafodion.apache.org/docs/spj_guide/index.html#adjustsalary-procedure
// for more documentation.
public static void adjustSalary( BigDecimal empNum
, double percent
http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/docs/spj_guide/src/resources/source/employeeJob.java
----------------------------------------------------------------------
diff --git a/docs/spj_guide/src/resources/source/employeeJob.java b/docs/spj_guide/src/resources/source/employeeJob.java
index ce5cdab..e9f083a 100644
--- a/docs/spj_guide/src/resources/source/employeeJob.java
+++ b/docs/spj_guide/src/resources/source/employeeJob.java
@@ -1,7 +1,7 @@
// The EMPLOYEEJOB procedure accepts an employee number and returns a job
// code or null value to an output parameter.
//
-// See http://trafodion.incubator.apache.org/docs/spj_guide/index.html#employeejob-procedure
+// See http://trafodion.apache.org/docs/spj_guide/index.html#employeejob-procedure
// for more documentation.
public static void employeeJob( int empNum
, java.lang.Integer[] jobCode
http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/docs/spj_guide/src/resources/source/lowerPrice.java
----------------------------------------------------------------------
diff --git a/docs/spj_guide/src/resources/source/lowerPrice.java b/docs/spj_guide/src/resources/source/lowerPrice.java
index b49ff2f..db00775 100644
--- a/docs/spj_guide/src/resources/source/lowerPrice.java
+++ b/docs/spj_guide/src/resources/source/lowerPrice.java
@@ -2,7 +2,7 @@
// is, have less than 50 orders) and lowers the price of these items in the
// database by 10 percent.
//
-// See http://trafodion.incubator.apache.org/docs/spj_guide/index.html#lowerprice-procedure
+// See http://trafodion.apache.org/docs/spj_guide/index.html#lowerprice-procedure
// for more documentation.
public static void lowerPrice() throws SQLException
{
http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/docs/spj_guide/src/resources/source/numDailyOrders.java
----------------------------------------------------------------------
diff --git a/docs/spj_guide/src/resources/source/numDailyOrders.java b/docs/spj_guide/src/resources/source/numDailyOrders.java
index 568d71f..642ab85 100644
--- a/docs/spj_guide/src/resources/source/numDailyOrders.java
+++ b/docs/spj_guide/src/resources/source/numDailyOrders.java
@@ -1,7 +1,7 @@
// The DAILYORDERS procedure accepts a date and returns the number of
//orders on that date to an output parameter.
//
-// See http://trafodion.incubator.apache.org/docs/spj_guide/index.html#dailyorders-procedure
+// See http://trafodion.apache.org/docs/spj_guide/index.html#dailyorders-procedure
// for additional documenation.
public static void numDailyOrders( Date date
, int[] numOrders
http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/docs/spj_guide/src/resources/source/numMonthlyOrders.java
----------------------------------------------------------------------
diff --git a/docs/spj_guide/src/resources/source/numMonthlyOrders.java b/docs/spj_guide/src/resources/source/numMonthlyOrders.java
index 942ea01..7654d12 100644
--- a/docs/spj_guide/src/resources/source/numMonthlyOrders.java
+++ b/docs/spj_guide/src/resources/source/numMonthlyOrders.java
@@ -1,7 +1,7 @@
// The MONTHLYORDERS procedure accepts an integer representing the month
// and returns the number of orders during that month to an output parameter.
//
-// See http://trafodion.incubator.apache.org/docs/spj_guide/index.html#monthlyorders-procedure
+// See http://trafodion.apache.org/docs/spj_guide/index.html#monthlyorders-procedure
// for more documentation.
public static void numMonthlyOrders( int month
, int[] numOrders
http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/docs/spj_guide/src/resources/source/orderSummary.java
----------------------------------------------------------------------
diff --git a/docs/spj_guide/src/resources/source/orderSummary.java b/docs/spj_guide/src/resources/source/orderSummary.java
index 8b8e5bb..50cdf74 100644
--- a/docs/spj_guide/src/resources/source/orderSummary.java
+++ b/docs/spj_guide/src/resources/source/orderSummary.java
@@ -11,7 +11,7 @@
// contains fields for the order number, part number, unit price, quantity
// ordered, and part description.
//
-// See http://trafodion.incubator.apache.org/docs/spj_guide/index.html#ordersummary-procedure
+// See http://trafodion.apache.org/docs/spj_guide/index.html#ordersummary-procedure
// for more documentation.
public static void orderSummary( java.lang.String onOrAfter
, long[] numOrders
http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/docs/spj_guide/src/resources/source/partData.java
----------------------------------------------------------------------
diff --git a/docs/spj_guide/src/resources/source/partData.java b/docs/spj_guide/src/resources/source/partData.java
index 6d7b54b..db0f8dc 100644
--- a/docs/spj_guide/src/resources/source/partData.java
+++ b/docs/spj_guide/src/resources/source/partData.java
@@ -8,7 +8,7 @@
// * A result set that contains rows from the PARTSUPP table for suppliers who carry this part.
// * A result set that contains rows from the EMPLOYEE table for sales reps who have sold this part.
//
-// See http://trafodion.incubator.apache.org/docs/spj_guide/index.html#partdata-procedure
+// See http://trafodion.apache.org/docs/spj_guide/index.html#partdata-procedure
// for more documentation.
public static void partData( int partNum
, String[] partDescription
http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/docs/spj_guide/src/resources/source/partLocations.java
----------------------------------------------------------------------
diff --git a/docs/spj_guide/src/resources/source/partLocations.java b/docs/spj_guide/src/resources/source/partLocations.java
index 88cdaae..873b40d 100644
--- a/docs/spj_guide/src/resources/source/partLocations.java
+++ b/docs/spj_guide/src/resources/source/partLocations.java
@@ -2,7 +2,7 @@
// set of location codes that have the exact quantity and a set of location
// codes that have more than that quantity.
//
-// See http://trafodion.incubator.apache.org/docs/spj_guide/index.html#partlocations-procedure
+// See http://trafodion.apache.org/docs/spj_guide/index.html#partlocations-procedure
// for more documentation.
public static void partLocations( int partNum
, int quantity
http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/docs/spj_guide/src/resources/source/projectTeam.java
----------------------------------------------------------------------
diff --git a/docs/spj_guide/src/resources/source/projectTeam.java b/docs/spj_guide/src/resources/source/projectTeam.java
index 0d150c4..024c348 100644
--- a/docs/spj_guide/src/resources/source/projectTeam.java
+++ b/docs/spj_guide/src/resources/source/projectTeam.java
@@ -2,7 +2,7 @@
// employee number, first name, last name, and location of the employees
// assigned to that project.
//
-// See http://trafodion.incubator.apache.org/docs/spj_guide/index.html#projectteam-procedure
+// See http://trafodion.apache.org/docs/spj_guide/index.html#projectteam-procedure
// for more documentation.
public static void projectTeam( int projectCode
, ResultSet[] members
http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/docs/spj_guide/src/resources/source/supplierInfo.java
----------------------------------------------------------------------
diff --git a/docs/spj_guide/src/resources/source/supplierInfo.java b/docs/spj_guide/src/resources/source/supplierInfo.java
index c98a392..01a1dd8 100644
--- a/docs/spj_guide/src/resources/source/supplierInfo.java
+++ b/docs/spj_guide/src/resources/source/supplierInfo.java
@@ -2,7 +2,7 @@
// supplier's name, street, city, state, and post code to separate output
// parameters.
//
-// See http://trafodion.incubator.apache.org/docs/spj_guide/index.html#supplierinfo-procedure
+// See http://trafodion.apache.org/docs/spj_guide/index.html#supplierinfo-procedure
// for more documentation.
public static void supplierInfo( BigDecimal suppNum
, String[] suppName
http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/docs/spj_guide/src/resources/source/supplyQuantities.java
----------------------------------------------------------------------
diff --git a/docs/spj_guide/src/resources/source/supplyQuantities.java b/docs/spj_guide/src/resources/source/supplyQuantities.java
index 59a6911..c29d593 100644
--- a/docs/spj_guide/src/resources/source/supplyQuantities.java
+++ b/docs/spj_guide/src/resources/source/supplyQuantities.java
@@ -2,7 +2,7 @@
// quantities of available parts in inventory to separate output
// parameters.
//
-// See http://trafodion.incubator.apache.org/docs/spj_guide/index.html#supplyquantities-procedure
+// See http://trafodion.apache.org/docs/spj_guide/index.html#supplyquantities-procedure
// for more documentation.
public static void supplyQuantities( int[] avgQty
, int[] minQty
http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/docs/spj_guide/src/resources/source/topSalesReps.java
----------------------------------------------------------------------
diff --git a/docs/spj_guide/src/resources/source/topSalesReps.java b/docs/spj_guide/src/resources/source/topSalesReps.java
index beee8ca..18eb455 100644
--- a/docs/spj_guide/src/resources/source/topSalesReps.java
+++ b/docs/spj_guide/src/resources/source/topSalesReps.java
@@ -4,7 +4,7 @@
// figures of the top five sales representatives who had the highest sales
// (unit_price * qty_ordered) that quarter.
//
-// See http://trafodion.incubator.apache.org/docs/spj_guide/index.html#topsalesreps-procedure
+// See http://trafodion.apache.org/docs/spj_guide/index.html#topsalesreps-procedure
// for more documentation.
public static void topSalesReps( int whichQuarter
, ResultSet[] topReps
http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/docs/spj_guide/src/resources/source/totalPrice.java
----------------------------------------------------------------------
diff --git a/docs/spj_guide/src/resources/source/totalPrice.java b/docs/spj_guide/src/resources/source/totalPrice.java
index 5e1ff15..4eafbb4 100644
--- a/docs/spj_guide/src/resources/source/totalPrice.java
+++ b/docs/spj_guide/src/resources/source/totalPrice.java
@@ -2,7 +2,7 @@
// of an item, calculates the total price, including tax and shipping
// charges, and returns the total price to an input/output parameter.
//
-// See http://trafodion.incubator.apache.org/docs/spj_guide/index.html#totalprice-procedure
+// See http://trafodion.apache.org/docs/spj_guide/index.html#totalprice-procedure
// for more documentation.
public static void totalPrice( BigDecimal qtyOrdered
, String shippingSpeed
http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/docs/sql_reference/pom.xml
----------------------------------------------------------------------
diff --git a/docs/sql_reference/pom.xml b/docs/sql_reference/pom.xml
index c5ebf3c..83edd20 100644
--- a/docs/sql_reference/pom.xml
+++ b/docs/sql_reference/pom.xml
@@ -33,7 +33,7 @@
functions, and other SQL language elements supported by the Trafodion project’s
database software.
</description>
- <url>http://trafodion.incubator.apache.org</url>
+ <url>http://trafodion.apache.org</url>
<inceptionYear>2015</inceptionYear>
<parent>
<groupId>org.apache.trafodion</groupId>
@@ -191,7 +191,7 @@
<project-name>Trafodion</project-name>
<project-logo>${basedir}/../shared/trafodion-logo.jpg</project-logo>
<project-support>user@trafodion.incubator.apache.org</project-support>
- <docs-url>http://trafodion.incubator.apache.org/docs</docs-url>
+ <docs-url>http://trafodion.apache.org/docs</docs-url>
<build-date>${maven.build.timestamp}</build-date>
<google-analytics-account>UA-72491210-1</google-analytics-account>
</attributes>
@@ -213,7 +213,7 @@
<project-name>Trafodion</project-name>
<project-logo>${basedir}/../shared/trafodion-logo.jpg</project-logo>
<project-support>user@trafodion.incubator.apache.org</project-support>
- <docs-url>http://trafodion.incubator.apache.org/docs</docs-url>
+ <docs-url>http://trafodion.apache.org/docs</docs-url>
<build-date>${maven.build.timestamp}</build-date>
<pdf-stylesdir>${basedir}/../shared</pdf-stylesdir>
<pdf-style>trafodion</pdf-style>
@@ -290,9 +290,9 @@
<distributionManagement>
<site>
- <id>trafodion.incubator.apache.org</id>
- <name>Trafodion Website at incubator.apache.org</name>
- <!-- On why this is the tmp dir and not trafodion.incubator.apache.org, see
+ <id>trafodion.apache.org</id>
+ <name>Trafodion Website at apache.org</name>
+ <!-- On why this is the tmp dir and not trafodion.apache.org, see
https://issues.apache.org/jira/browse/HBASE-7593?focusedCommentId=13555866&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-13555866
-->
<url>file:///tmp</url>
http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/docs/src/site/markdown/index.md
----------------------------------------------------------------------
diff --git a/docs/src/site/markdown/index.md b/docs/src/site/markdown/index.md
index b8798b3..a023bfa 100644
--- a/docs/src/site/markdown/index.md
+++ b/docs/src/site/markdown/index.md
@@ -31,8 +31,8 @@ Running out of room with your current SQL solution? Starting a new operational a
Trafodion provides SQL access to structured, semi-structured, and unstructured data allowing you to run operational, historical, and analytical workloads on a single platform.
-[revolution]: http://trafodion.incubator.apache.org
-[scale]: http://trafodion.incubator.apache.org
+[revolution]: http://trafodion.apache.org
+[scale]: http://trafodion.apache.org
[stack]: index.html
@@ -45,7 +45,7 @@ Trafodion provides SQL access to structured, semi-structured, and unstructured d
<p><h5>We're working on release 2.2!</h5></p>
<p>Check out the <a href="https://cwiki.apache.org/confluence/display/TRAFODION/Roadmap">Roadmap</a> page for planned content.</p>
<p><h5>Apache Trafodion 2.1.0-incubating was released on May 1, 2017</h5></p>
- <p>Check it out on the <a href="http://trafodion.incubator.apache.org/download.html">Download</a> page.</p>
+ <p>Check it out on the <a href="http://trafodion.apache.org/download.html">Download</a> page.</p>
<p><h5>Want to disucss Trafodion in Chinese? Join the Trafodion discussion on Tencent QQ!</h5></p>
<p><a href="http://im.qq.com/">QQ</a> Group ID: 176011868.</p>
</td></tr></table>
@@ -70,14 +70,12 @@ Are you using Trafodion? We need permission to add your company's logo here.
## About
-Apache Trafodion (incubating) is a webscale SQL-on-Hadoop solution enabling transactional or operational workloads on Apache Hadoop.
+Apache Trafodion is a webscale SQL-on-Hadoop solution enabling transactional or operational workloads on Apache Hadoop.
The name "Trafodion" (the Welsh word for transactions, pronounced "Tra-vod-eee-on") was chosen specifically to emphasize the differentiation that Trafodion provides in closing a critical gap in the Hadoop ecosystem.
Trafodion builds on the scalability, elasticity, and flexibility of Hadoop. Trafodion extends Hadoop to provide guaranteed transactional integrity, enabling new kinds of big data applications to run on Hadoop.
-<em>Disclaimer: Apache Trafodion is an effort undergoing incubation at the Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.</em>
-
---
## Key Features
http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/docs/src/site/markdown/ldapcheck.md
----------------------------------------------------------------------
diff --git a/docs/src/site/markdown/ldapcheck.md b/docs/src/site/markdown/ldapcheck.md
index 02575ad..b5f12cc 100644
--- a/docs/src/site/markdown/ldapcheck.md
+++ b/docs/src/site/markdown/ldapcheck.md
@@ -13,5 +13,5 @@
License.
-->
Redirecting to the Trafodion Provisioning Guide...
-<p><meta http-equiv="refresh" content="0; url=http://trafodion.incubator.apache.org/docs/provisioning_guide/target/site/index.html#enable-security-ldapcheck"></meta></p>
+<p><meta http-equiv="refresh" content="0; url=http://trafodion.apache.org/docs/provisioning_guide/target/site/index.html#enable-security-ldapcheck"></meta></p>
http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/docs/src/site/markdown/ldapconfigcheck.md
----------------------------------------------------------------------
diff --git a/docs/src/site/markdown/ldapconfigcheck.md b/docs/src/site/markdown/ldapconfigcheck.md
index b24b16a..bada8f5 100644
--- a/docs/src/site/markdown/ldapconfigcheck.md
+++ b/docs/src/site/markdown/ldapconfigcheck.md
@@ -13,4 +13,4 @@
License.
-->
Redirecting to the Trafodion Provisioning Guide...
-<p><meta http-equiv="refresh" content="0; url=http://trafodion.incubator.apache.org/docs/provisioning_guide/target/site/index.html#enable-security-ldapconfigcheck"></meta></p>
+<p><meta http-equiv="refresh" content="0; url=http://trafodion.apache.org/docs/provisioning_guide/target/site/index.html#enable-security-ldapconfigcheck"></meta></p>
http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/docs/src/site/markdown/quickstart.md
----------------------------------------------------------------------
diff --git a/docs/src/site/markdown/quickstart.md b/docs/src/site/markdown/quickstart.md
index 22fbc66..bed136d 100644
--- a/docs/src/site/markdown/quickstart.md
+++ b/docs/src/site/markdown/quickstart.md
@@ -101,8 +101,8 @@ Trafodion provides connectivity services so that applications, tools, and other
# More Information
-For more information, refer to the [Trafodion Documentation Page] (documentation.html) for starting points. There is also a lot more information on the [Trafodion website] (http://trafodion.incubator.apache.org) and [Trafodion Wiki] (https://cwiki.apache.org/confluence/display/TRAFODION/Apache+Trafodion+Home) that you might refer to as you explore Trafodion.
+For more information, refer to the [Trafodion Documentation Page] (documentation.html) for starting points. There is also a lot more information on the [Trafodion website] (http://trafodion.apache.org) and [Trafodion Wiki] (https://cwiki.apache.org/confluence/display/TRAFODION/Apache+Trafodion+Home) that you might refer to as you explore Trafodion.
If you have questions or suggestions or just want to share what you've learned about Trafodion, you can contact a community of Trafodion users via the [Trafodion User Group mailing list](http://mail-archives.apache.org/mod_mbox/incubator-trafodion-user/) or other [Project Mailing Lists] (http://trafodion.apache.org/mail-lists.html)
-Have fun with Trafodion!
\ No newline at end of file
+Have fun with Trafodion!
http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/docs/src/site/site.xml
----------------------------------------------------------------------
diff --git a/docs/src/site/site.xml b/docs/src/site/site.xml
index 64328df..fc1b70e 100644
--- a/docs/src/site/site.xml
+++ b/docs/src/site/site.xml
@@ -35,7 +35,7 @@
<!-- Apache Trafodion, but with "Trafodion" highlighted -->
<name>
<![CDATA[
- <img src="images/logos/trafodion-logo.jpg" alt="Trafodion Logo" width="383"> <a href="http://incubator.apache.org" target="_blank"><span class="logo-right"><img id="incubator-logo" alt="Apache Incubator" src="images/logos/egg-logo.png" /></span></a>
+ <img src="images/logos/trafodion-logo.jpg" alt="Trafodion Logo" width="383">
]]>
</name>
<href>index.html</href>
@@ -57,7 +57,7 @@
<brand>
<!-- Brand text in top-left part of the site -->
<name>
- <![CDATA[<span class="brand-apache">Apache </span><span class="brand-trafodion">Trafodion</span> <span class="brand-apache">(incubating)</span> ]]>
+ <![CDATA[<span class="brand-apache">Apache </span><span class="brand-trafodion">Trafodion</span> <span class="brand-apache"></span> ]]>
</name>
<href>index.html</href>
</brand>
@@ -249,7 +249,6 @@
<item href="https://cwiki.apache.org/confluence/display/TRAFODION/Metadata+Cleanup" name="Metadata Cleanup Utility"/>
</menu>
<menu name="Apache">
- <item href="http://incubator.apache.org/projects/trafodion.html" name="Project Status" target="_blank"/>
<item href="http://www.apache.org/foundation/how-it-works.html" name="Apache Foundation" target="_blank"/>
<item href="http://www.apache.org/licenses/" name="Apache License" target="_blank"/>
<item href="http://www.apache.org/security/" name="Apache Security" target="_blank"/>
@@ -260,11 +259,8 @@
<footer>
<hr />
<div class="row span16">
- <span>Apache, Apache Maven, Apache Maven Fluido Skin, the Apache feather logo, the Apache Maven project logo and the Apache Incubator project logo
+ <span>Apache, Apache Maven, Apache Maven Fluido Skin, the Apache feather logo, and the Apache Maven project logo
are trademarks of the Apache Software Foundation.</span><br /><br />
- <span>
- <a href="http://incubator.apache.org" target="_blank"><img id="incubator-logo" alt="Apache Incubator" src="images/logos/egg-logo.png" /></a>
- </span>
</div>
</footer>
</body>
http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/install/ambari-installer/traf_ambari.spec
----------------------------------------------------------------------
diff --git a/install/ambari-installer/traf_ambari.spec b/install/ambari-installer/traf_ambari.spec
index 1c1dcb9..e49b2e9 100644
--- a/install/ambari-installer/traf_ambari.spec
+++ b/install/ambari-installer/traf_ambari.spec
@@ -29,7 +29,7 @@ Group: Applications/Databases
Source0: ambari_rpm.tar.gz
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
-URL: http://trafodion.incubator.apache.org
+URL: http://trafodion.apache.org
Requires: ambari-server
http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/licenses/lic-server-src
----------------------------------------------------------------------
diff --git a/licenses/lic-server-src b/licenses/lic-server-src
index dbe56af..fe1cf85 100644
--- a/licenses/lic-server-src
+++ b/licenses/lic-server-src
@@ -4,8 +4,8 @@ The core component of Apache Trafodion uses several BSD-like, MIT-like and Postg
+++++++++++++++++++++++++++++
BSD-3 clause for files:
- incubator-trafodion/core/sql/common/swsprintf.cpp
- incubator-trafodion/core/sql/common/swscanf.cpp
+ trafodion/core/sql/common/swsprintf.cpp
+ trafodion/core/sql/common/swscanf.cpp
Copyright (c) 1990, 1993
The Regents of the University of California. All rights reserved.
@@ -39,7 +39,7 @@ Copyright (c) 1990, 1993
+++++++++++++++++++++++++++++
-BSD-3 clause for file incubator-trafodion/core/sql/parser/ulexer.h
+BSD-3 clause for file trafodion/core/sql/parser/ulexer.h
Copyright (c) 1993 The Regents of the University of California.
@@ -59,7 +59,7 @@ BSD-3 clause for file incubator-trafodion/core/sql/parser/ulexer.h
+++++++++++++++++++++++++++++
-MIT-Expat for files in: incubator-trafodion/core/sql/qmscommon/expat
+MIT-Expat for files in: trafodion/core/sql/qmscommon/expat
Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
and Clark Cooper
@@ -68,7 +68,7 @@ MIT-Expat for files in: incubator-trafodion/core/sql/qmscommon/expat
Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006 Expat maintainers.
Copyright 2000, Clark Cooper
- For details see incubator-trafodion/core/sql/qmscommon/expat/COPYING
+ For details see trafodion/core/sql/qmscommon/expat/COPYING
+++++++++++++++++++++++++++++
@@ -79,18 +79,18 @@ MIT-like licenses:
+++++++++++++++++++++++++++++
BSD-3 clause for files in:
- incubator-trafodion/dcs/src/main/resources/dcs-webapps/master/datatables
+ trafodion/dcs/src/main/resources/dcs-webapps/master/datatables
Copyright 2009 Allan Jardine. All Rights Reserved
Copyright 2008-2012 Allan Jardine, all rights reserved.
For details see:
- incubator-trafodion/dcs/src/main/resources/dcs-webapps/master/datatables/license-bsd.txt
+ trafodion/dcs/src/main/resources/dcs-webapps/master/datatables/license-bsd.txt
+++++++++++++++++++++++++++++
MIT-Expat for files in:
- incubator-trafodion/dcs/src/main/resources/dcs-webapps/master/js/lib/jit.js
+ trafodion/dcs/src/main/resources/dcs-webapps/master/js/lib/jit.js
Copyright (c) 2011 Sencha Inc. - Author: Nicolas Garcia Belmonte (http://philogb.github.com/)
Copyright (c) 2006-2010 Valerio Proietti
@@ -116,8 +116,8 @@ MIT-Expat for files in:
+++++++++++++++++++++++++++++
MIT-Expat for files in:
- incubator-trafodion/dcs/src/main/resources/dcs-webapps/master/jquery-ui
- incubator-trafodion/dcs/src/main/resources/dcs-webapps/master/js/lib/jquery-1.11.0.js
+ trafodion/dcs/src/main/resources/dcs-webapps/master/jquery-ui
+ trafodion/dcs/src/main/resources/dcs-webapps/master/js/lib/jquery-1.11.0.js
Copyright 2014 jQuery Foundation and other contributors
(c) 2005, 2014 jQuery Foundation, Inc.
@@ -142,11 +142,11 @@ MIT-Expat for files in:
++++++++++++++++++++++++++++++
The PostgreSQL Licence (PostgreSQL) for files in:
- incubator-trafodion/core/sql/common/ComJSON.cpp
- incubator-trafodion/core/sql/common/ComJSON.h
- incubator-trafodion/core/sql/common/ComJSONFuncs.cpp
- incubator-trafodion/core/sql/common/ComJSONStringInfo.cpp
- incubator-trafodion/core/sql/common/ComJSONStringInfo.h
+ trafodion/core/sql/common/ComJSON.cpp
+ trafodion/core/sql/common/ComJSON.h
+ trafodion/core/sql/common/ComJSONFuncs.cpp
+ trafodion/core/sql/common/ComJSONStringInfo.cpp
+ trafodion/core/sql/common/ComJSONStringInfo.h
PostgreSQL License is a liberal Open Source license, similar to the BSD or MIT licenses.
@@ -167,4 +167,4 @@ $ORGANISATION SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT LIMITED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED
HEREUNDER IS ON AN "AS IS" BASIS, AND $ORGANISATION HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE,
SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-++++++++++++++++++++++++++++++
\ No newline at end of file
+++++++++++++++++++++++++++++++
http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/licenses/lic-test-src
----------------------------------------------------------------------
diff --git a/licenses/lic-test-src b/licenses/lic-test-src
index e60863d..a487c84 100644
--- a/licenses/lic-test-src
+++ b/licenses/lic-test-src
@@ -2,7 +2,7 @@
Software used to test Apache Trafodion bundles source with BSD-like licenses:
BSD-3 clause for files in:
- incubator-trafodion/tests/phx/src/test/java/org/trafodion/phoenix/end2end
+ trafodion/tests/phx/src/test/java/org/trafodion/phoenix/end2end
Apache Trafodion changed these files to work within its test environment
@@ -37,7 +37,7 @@ As part of testing large objects (LOBs), the testware needs some object files.
Two pictures were donated for this purpose by Christophe LeRouzo. He has
formally given Apache Trafodion to permission to use these picturs.
- incubator-trafodion/core/sql/regress/executor/anoush.jpg
- incubator-trafodion/core/sql/regress/executor/deep.jpg
+ trafodion/core/sql/regress/executor/anoush.jpg
+ trafodion/core/sql/regress/executor/deep.jpg
+++++++++++++++++++++++++++++
http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9298358..e23e8f7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,7 +40,7 @@
<packaging>pom</packaging>
<name>Apache Trafodion</name>
<description>Trafodion is a webscale SQL-on-Hadoop solution enabling transactional or operational workloads on Hadoop.</description>
- <url>http://trafodion.incubator.apache.org</url>
+ <url>http://trafodion.apache.org</url>
<inceptionYear>2015</inceptionYear>
<licenses>
@@ -280,9 +280,9 @@
<distributionManagement>
<site>
- <id>trafodion.incubator.apache.org</id>
- <name>Trafodion Website at incubator.apache.org</name>
- <!-- On why this is the tmp dir and not trafodion.incubator.apache.org, see
+ <id>trafodion.apache.org</id>
+ <name>Trafodion Website at apache.org</name>
+ <!-- On why this is the tmp dir and not trafodion.apache.org, see
https://issues.apache.org/jira/browse/HBASE-7593?focusedCommentId=13555866&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-13555866
-->
<url>file:///tmp</url>
http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/tools/docker/Dockerfile
----------------------------------------------------------------------
diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
index be75b9b..21cb98e 100644
--- a/tools/docker/Dockerfile
+++ b/tools/docker/Dockerfile
@@ -17,7 +17,7 @@
FROM centos:centos6.6
MAINTAINER Trafodion Community <de...@trafodion.incubator.apache.org>
-LABEL Vendor="Apache Trafodion (incubating)"
+LABEL Vendor="Apache Trafodion"
LABEL version=unstable
# download and install environment dependencies
[11/32] trafodion git commit: Changes to handle errors during drop of
lob tables that leave the table inconsistent. (cherry picked from commit
749295ad774620d49db79d961b1bbacac8d589c7)
Posted by li...@apache.org.
Changes to handle errors during drop of lob tables that leave the table inconsistent.
(cherry picked from commit 749295ad774620d49db79d961b1bbacac8d589c7)
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/e8c09ebb
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/e8c09ebb
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/e8c09ebb
Branch: refs/heads/master
Commit: e8c09ebb678ab6560130bf687dc1e52c9b04d64a
Parents: f186448
Author: Sandhya Sundaresan <sa...@apache.org>
Authored: Mon Sep 11 17:57:02 2017 +0000
Committer: Sandhya Sundaresan <sa...@apache.org>
Committed: Mon Sep 11 17:57:02 2017 +0000
----------------------------------------------------------------------
core/sql/cli/Cli.cpp | 48 ++++++++++++++++------------
core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 5 ++-
2 files changed, 31 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/e8c09ebb/core/sql/cli/Cli.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/Cli.cpp b/core/sql/cli/Cli.cpp
index a25a31b..cd1c852 100644
--- a/core/sql/cli/Cli.cpp
+++ b/core/sql/cli/Cli.cpp
@@ -10519,7 +10519,7 @@ Lng32 SQLCLI_LOB_GC_Interface
if (rc )
{
- cliRC = 9999; // Warning
+ cliRC = 1; // Warning
ComDiagsArea * da = &diags;
lobDebugInfo("compactLobDataFile Failed",0,__LINE__,lobTrace);
@@ -10667,7 +10667,7 @@ Lng32 SQLCLI_LOBddlInterface
if (rc)
{
- cliRC = -9999;
+ cliRC = 0;
ComDiagsArea * da = &diags;
ExRaiseSqlError(currContext.exHeap(), &da,
(ExeErrorCode)(8442), NULL, &cliRC ,
@@ -10734,22 +10734,7 @@ Lng32 SQLCLI_LOBddlInterface
// drop descriptor table
for (Lng32 i = 0; i < numLOBs; i++)
- {
- Lng32 rc = ExpLOBoper::dropLOB
- (NULL, currContext.exHeap(),(void *)&currContext,
- lobLocList[i],hdfsPort,hdfsServer,
- objectUID, lobNumList[i]);
-
- if (rc)
- {
- cliRC = -9999;
- ComDiagsArea * da = &diags;
- ExRaiseSqlError(currContext.exHeap(), &da,
- (ExeErrorCode)(8442), NULL, &cliRC ,
- &rc, NULL, (char*)"ExpLOBInterfaceDrop ",
- getLobErrStr(rc));
- goto error_return;
- }
+ {
// drop LOB descriptor and LOB header tables
char lobHandle[LOB_HANDLE_LEN];
@@ -10782,7 +10767,28 @@ Lng32 SQLCLI_LOBddlInterface
}
} // for
-
+ //If all the descriptor tables got dropped correctly, drop the hdfs
+ //lob data files. Note that if there is an error in the drop of the
+ //descriptor tables above , the transaction will restore each of the
+ //above tables .
+ for (Lng32 i = 0; i < numLOBs; i++)
+ {
+ Lng32 rc = ExpLOBoper::dropLOB
+ (NULL, currContext.exHeap(),(void *)&currContext,
+ lobLocList[i],hdfsPort,hdfsServer,
+ objectUID, lobNumList[i]);
+ // Ignore 'not found' error from hdfs file deletes until this is made transactional just like Hbase tables are.
+ if (rc && (rc != -LOB_DATA_FILE_DELETE_ERROR))
+ {
+ cliRC = -1;
+ ComDiagsArea * da = &diags;
+ ExRaiseSqlError(currContext.exHeap(), &da,
+ (ExeErrorCode)(8442), NULL, &cliRC ,
+ &rc, NULL, (char*)"ExpLOBInterfaceDrop ",
+ getLobErrStr(rc));
+ goto error_return;
+ }
+ }//for
}
break;
@@ -10813,9 +10819,9 @@ Lng32 SQLCLI_LOBddlInterface
lobLocList[i],hdfsPort, hdfsServer,
objectUID, lobNumList[i]);
- if (rc)
+ if (rc && rc != -LOB_DATA_FILE_DELETE_ERROR)
{
- cliRC = -9999;
+ cliRC = -1;
ComDiagsArea * da = &diags;
ExRaiseSqlError(currContext.exHeap(), &da,
(ExeErrorCode)(8442), NULL, &cliRC ,
http://git-wip-us.apache.org/repos/asf/trafodion/blob/e8c09ebb/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp b/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
index 3cdd063..726a866 100644
--- a/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
+++ b/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
@@ -2929,7 +2929,8 @@ short CmpSeabaseDDL::createSeabaseTable2(
if (rc < 0)
{
- //sss TBD need to retrive the cli diags here.
+ // retrieve the cli diags here.
+ CmpCommon::diags()->mergeAfter(*(GetCliGlobals()->currContext()->getDiagsArea()));
*CmpCommon::diags() << DgSqlCode(-CAT_CREATE_OBJECT_ERROR)
<< DgTableName(extTableName);
deallocEHI(ehi);
@@ -4403,6 +4404,8 @@ short CmpSeabaseDDL::dropSeabaseTable2(
lobLocList,NULL,lobHdfsServer, lobHdfsPort,0,lobTrace);
if (rc < 0)
{
+ // retrieve the cli diags here.
+ CmpCommon::diags()->mergeAfter( *(GetCliGlobals()->currContext()->getDiagsArea()));
*CmpCommon::diags() << DgSqlCode(-CAT_UNABLE_TO_DROP_OBJECT)
<< DgTableName(extTableName);
deallocEHI(ehi);
[02/32] trafodion git commit: Capitalize XML
Posted by li...@apache.org.
Capitalize XML
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/a465ec83
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/a465ec83
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/a465ec83
Branch: refs/heads/master
Commit: a465ec83025a8a3664a1b0f9a28c86021287952a
Parents: ef73b77
Author: liu.yu <yu...@esgyn.cn>
Authored: Tue Aug 15 11:22:21 2017 +0800
Committer: liu.yu <yu...@esgyn.cn>
Committed: Tue Aug 22 11:33:03 2017 +0800
----------------------------------------------------------------------
docs/odb_user/src/asciidoc/_chapters/load.adoc | 59 +++++++++++++++++++++
1 file changed, 59 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/a465ec83/docs/odb_user/src/asciidoc/_chapters/load.adoc
----------------------------------------------------------------------
diff --git a/docs/odb_user/src/asciidoc/_chapters/load.adoc b/docs/odb_user/src/asciidoc/_chapters/load.adoc
index 087c0dc..6a2eb86 100644
--- a/docs/odb_user/src/asciidoc/_chapters/load.adoc
+++ b/docs/odb_user/src/asciidoc/_chapters/load.adoc
@@ -637,6 +637,65 @@ odb considers the string following the “em” character as the path of the fil
NOTE: odb does not load rows where the size of the input file is greater than the target database column.
+=======
+[[load_xml_files]]
+== Load XML Files
+Trafodion odb supports loading XML files into tables, the key construct for XML files can be an element or an attribute.
+
+=== Load XML Files Where Data is Stored in Element Nodes
+
+. Create a table.
+```
+./odb64luo -x "create table testxmlload(id int, name char(20))"
+```
+
+[start=2]
+. Suppose you have a xml file where data is stored in element nodes like the following.
+```
+-bash-4.1$ cat test.xml
+<?xml version="1.0" encoding="UTF-8"?>
+<data>
+<id>1</id>
+<name>hello</name>
+</data>
+```
+
+TIP: To check what will be loaded before loading XML file into table, run the following command
+`./odb64luo -l src=test.xml :tgt=testxmlload:xmltag=data:xmldump`
+
+[start=3]
+. Load the test.xml file into the table, run the following command.
+```
+./odb64luo -l src=test.xml:tgt=testxmlload:xmltag=data
+```
+
+TIP: `xmltag=data` means odb will load data from the element nodes. For more information, see <<Data Loading Operators>>.
+
+=== Load XML Files Where Data is Stored in Attribute Nodes
+. Create a table.
+```
+./odb64luo -x "create table testxmlload(id int, name char(20))"
+```
+
+[start=2]
+. Suppose you have a XML file where data is stored in attribute nodes like the following.
+```
+-bash-4.1$ cat test.xml
+<?xml version="1.0" encoding="UTF-8"?>
+<data id="1" name="hello"></data>
+```
+
+TIP: To check what will be loaded before loading XML file into table, run the following command.
+`./odb64luo -l src=test.xml:tgt=testxmlload:xmltag=data:xmldump`
+
+[start=3]
+. Load the test.xml file into the table, run the following command.
+```
+./odb64luo -l src=test.xml:tgt=testxmlload:xmltag=+data
+```
+
+TIP: `xmltag=+data` (with a plus sign specified) means odb will load data from the attribute nodes. For more information, see <<Data Loading Operators>>.
+
<<<
== Reduce the ODBC Buffer Size
odb allocates memory for the ODBC buffers during load/extract operations based on the max possible length of the
[14/32] trafodion git commit: [TRAFODION-2740]JDBC extract LOB
context in chunks
Posted by li...@apache.org.
[TRAFODION-2740]JDBC extract LOB context in chunks
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/bd792ff7
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/bd792ff7
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/bd792ff7
Branch: refs/heads/master
Commit: bd792ff7ef0a81c6b0106ce1d2aaeb3ff34d9701
Parents: 808c874
Author: Weiqing Xu <we...@esgyn.cn>
Authored: Wed Sep 20 05:57:26 2017 +0000
Committer: Weiqing Xu <we...@esgyn.cn>
Committed: Wed Sep 20 05:57:26 2017 +0000
----------------------------------------------------------------------
.../trafodion/jdbc/t4/ExtractLobMessage.java | 13 ++-
.../org/trafodion/jdbc/t4/ExtractLobReply.java | 23 ++++-
.../java/org/trafodion/jdbc/t4/TrafT4Blob.java | 11 ---
.../java/org/trafodion/jdbc/t4/TrafT4Clob.java | 13 ---
.../java/org/trafodion/jdbc/t4/TrafT4Lob.java | 37 +++++++-
.../nsksrvr/Interface/marshalingsrvr_srvr.cpp | 48 +++++++---
.../nsksrvr/Interface/marshalingsrvr_srvr.h | 6 +-
.../src/odbc/nsksrvr/Interface/odbcs_srvr.cpp | 11 ++-
.../odbc/nsksrvr/Interface/odbcs_srvr_res.cpp | 18 ++--
.../src/odbc/nsksrvr/Interface/odbcs_srvr_res.h | 6 +-
core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.cpp | 20 ++--
core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.h | 3 +-
.../conn/odbc/src/odbc/nsksrvrcore/srvrcommon.h | 5 +-
.../odbc/src/odbc/nsksrvrcore/srvrothers.cpp | 99 +++++++-------------
14 files changed, 174 insertions(+), 139 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/bd792ff7/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/ExtractLobMessage.java
----------------------------------------------------------------------
diff --git a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/ExtractLobMessage.java b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/ExtractLobMessage.java
index 6c54ff6..8a6c15c 100644
--- a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/ExtractLobMessage.java
+++ b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/ExtractLobMessage.java
@@ -27,9 +27,9 @@ class ExtractLobMessage {
static final short LOB_EXTRACT_LEN = 0;
static final short LOB_EXTRACT_BUFFER = LOB_EXTRACT_LEN + 1;
- static final short LOB_EXTRACT_BOTH_LEN_AND_BUFFER = LOB_EXTRACT_BUFFER + 1;
+ static final short LOB_CLOSE_CURSOR = LOB_EXTRACT_BUFFER + 1;
- static LogicalByteArray marshal(short extractType, String lobHandle, int lobHandleCharset, long lobLength, InterfaceConnection ic) throws SQLException{
+ static LogicalByteArray marshal(short extractType, String lobHandle, int lobHandleCharset, long extractLen, InterfaceConnection ic) throws SQLException{
int wlength = Header.sizeOf();
LogicalByteArray buf;
@@ -37,20 +37,23 @@ class ExtractLobMessage {
byte[] lobHandleBytes = ic.encodeString(lobHandle, InterfaceUtilities.SQLCHARSETCODE_UTF8);
wlength += TRANSPORT.size_int;
- // wlength += TRANSPORT.size_long; // length of lobHandle
if (lobHandle.length() > 0) {
wlength += TRANSPORT.size_bytesWithCharset(lobHandleBytes);
}
- if (lobLength > 0) {
+ if (extractLen > 0) {
wlength += TRANSPORT.size_long;
}
buf = new LogicalByteArray(wlength, Header.sizeOf(), ic.getByteSwap());
- buf.insertInt(extractType);
+ buf.insertShort(extractType);
buf.insertStringWithCharset(lobHandleBytes, lobHandleCharset);
+
+ if (extractType == LOB_EXTRACT_BUFFER) {
+ buf.insertLong(extractLen);
+ }
return buf;
} catch (Exception e) {
throw TrafT4Messages.createSQLException(ic.t4props_, ic.getLocale(), "unsupported_encoding", "UTF-8");
http://git-wip-us.apache.org/repos/asf/trafodion/blob/bd792ff7/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/ExtractLobReply.java
----------------------------------------------------------------------
diff --git a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/ExtractLobReply.java b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/ExtractLobReply.java
index ca2c7f2..c54d854 100644
--- a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/ExtractLobReply.java
+++ b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/ExtractLobReply.java
@@ -30,9 +30,11 @@ class ExtractLobReply {
odbc_SQLSvc_ExtractLob_exc_ m_p1;
String proxySyntax = "";
- int lobDataLen = 0;
+ long lobLength = 0;
+ long extractLen = 0;
+ byte[] extractData = null;
- byte[] lobDataValue = null;
+ public short extractAPIType = 0;
ExtractLobReply(LogicalByteArray buf, InterfaceConnection ic) throws SQLException {
buf.setLocation(Header.sizeOf());
@@ -42,9 +44,20 @@ class ExtractLobReply {
m_p1.extractFromByteArray(buf, ic);
if (m_p1.exception_nr == TRANSPORT.CEE_SUCCESS) {
- lobDataLen = (int) buf.extractInt();
- if (lobDataLen > 0) {
- lobDataValue = buf.extractByteArray(lobDataLen);
+
+ extractAPIType = buf.extractShort();
+ switch (extractAPIType) {
+ case 0:
+ lobLength = buf.extractLong();
+ break;
+ case 1:
+ extractLen = buf.extractLong();
+ extractData = buf.extractByteArray(extractLen);
+ break;
+ case 2:
+ break;
+ default:
+ break;
}
}
}
http://git-wip-us.apache.org/repos/asf/trafodion/blob/bd792ff7/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4Blob.java
----------------------------------------------------------------------
diff --git a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4Blob.java b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4Blob.java
index 499dd82..fb76ea5 100644
--- a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4Blob.java
+++ b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4Blob.java
@@ -35,13 +35,11 @@ public class TrafT4Blob extends TrafT4Lob implements Blob
super(connection, lobHandle, data, Types.BLOB);
}
- @Override
public InputStream getBinaryStream() throws SQLException {
testAvailability();
return new ByteArrayInputStream((byte[]) data_);
}
- @Override
public InputStream getBinaryStream(long pos, long length) throws SQLException {
testAvailability();
return new ByteArrayInputStream((byte[]) data_);
@@ -53,7 +51,6 @@ public class TrafT4Blob extends TrafT4Lob implements Blob
* bytes starting at position pos.
* */
- @Override
public byte[] getBytes(long pos, int length) throws SQLException {
testAvailability();
@@ -75,14 +72,12 @@ public class TrafT4Blob extends TrafT4Lob implements Blob
return buf;
}
- @Override
public int setBytes(long pos, byte[] bytes) throws SQLException {
testAvailability();
return setBytes(pos, bytes, 0, bytes.length);
}
- @Override
public int setBytes(long pos, byte[] bytes, int offset, int len) throws SQLException {
testAvailability();
OutputStream out = setBinaryStream(pos);
@@ -102,24 +97,20 @@ public class TrafT4Blob extends TrafT4Lob implements Blob
return len;
}
- @Override
public long position(Blob pattern, long start) throws SQLException {
return position(pattern.getBytes(0, (int) pattern.length()), start);
}
- @Override
public long position(byte[] pattern, long start) throws SQLException {
TrafT4Messages.throwUnsupportedFeatureException(connection_.props_, connection_.getLocale(), "position()");
return 0;
}
- @Override
public OutputStream setBinaryStream(long pos) throws SQLException {
testAvailability();
return setOutputStream(pos);
}
- @Override
public void truncate(long len) throws SQLException {
testAvailability();
@@ -145,13 +136,11 @@ public class TrafT4Blob extends TrafT4Lob implements Blob
}
- @Override
public long length() throws SQLException {
testAvailability();
return data_ == null ? 0 : ((byte[]) data_).length;
}
- @Override
public void free() throws SQLException {
data_ = null;
isFreed_ = true;
http://git-wip-us.apache.org/repos/asf/trafodion/blob/bd792ff7/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4Clob.java
----------------------------------------------------------------------
diff --git a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4Clob.java b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4Clob.java
index f7280fe..5877089 100644
--- a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4Clob.java
+++ b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4Clob.java
@@ -42,13 +42,11 @@ public class TrafT4Clob extends TrafT4Lob implements Clob {
this.data_ = "";
}
- @Override
public void free() throws SQLException {
data_ = null;
isFreed_ = true;
}
- @Override
public InputStream getAsciiStream() throws SQLException {
testAvailability();
if (data_ != null) {
@@ -58,7 +56,6 @@ public class TrafT4Clob extends TrafT4Lob implements Clob {
return null;
}
- @Override
public Reader getCharacterStream() throws SQLException {
testAvailability();
@@ -69,14 +66,12 @@ public class TrafT4Clob extends TrafT4Lob implements Clob {
return null;
}
- @Override
public Reader getCharacterStream(long pos, long length) throws SQLException {
testAvailability();
return new StringReader(getSubString(pos, (int) length));
}
- @Override
public String getSubString(long pos, int length) throws SQLException {
testAvailability();
@@ -94,7 +89,6 @@ public class TrafT4Clob extends TrafT4Lob implements Clob {
return ((String) data_).substring(beginIndex, endIndex);
}
- @Override
public long length() throws SQLException {
testAvailability();
if (data_ != null) {
@@ -104,7 +98,6 @@ public class TrafT4Clob extends TrafT4Lob implements Clob {
return 0;
}
- @Override
public long position(String searchstr, long start) throws SQLException {
testAvailability();
//start--;
@@ -123,12 +116,10 @@ public class TrafT4Clob extends TrafT4Lob implements Clob {
return pos;
}
- @Override
public long position(Clob searchstr, long start) throws SQLException {
return position(searchstr.getSubString(1L, (int) searchstr.length()), start);
}
- @Override
public OutputStream setAsciiStream(long pos) throws SQLException {
testAvailability();
if (pos < 1) {
@@ -139,14 +130,12 @@ public class TrafT4Clob extends TrafT4Lob implements Clob {
return setOutputStream(pos);
}
- @Override
public Writer setCharacterStream(long pos) throws SQLException {
testAvailability();
TrafT4Writer writer = new TrafT4Writer(this, pos);
return writer;
}
- @Override
public int setString(long pos, String str) throws SQLException {
testAvailability();
int startIndex = (int) pos - 1;
@@ -168,7 +157,6 @@ public class TrafT4Clob extends TrafT4Lob implements Clob {
return len;
}
- @Override
public int setString(long pos, String str, int offset, int len) throws SQLException {
testAvailability();
int start = (int) pos - 1;
@@ -183,7 +171,6 @@ public class TrafT4Clob extends TrafT4Lob implements Clob {
return len;
}
- @Override
public void truncate(long len) throws SQLException {
testAvailability();
if (len > ((String) data_).length()) {
http://git-wip-us.apache.org/repos/asf/trafodion/blob/bd792ff7/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4Lob.java
----------------------------------------------------------------------
diff --git a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4Lob.java b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4Lob.java
index 054da20..f18377b 100644
--- a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4Lob.java
+++ b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4Lob.java
@@ -34,6 +34,7 @@ public abstract class TrafT4Lob {
protected TrafT4Connection connection_ = null;
protected boolean isFreed_ = true;
protected int lobType = Types.BLOB;
+ protected long length = 0;
protected Object data_ = null;
@@ -91,23 +92,49 @@ public abstract class TrafT4Lob {
}
T4Connection t4connection = this.connection_.getServerHandle().getT4Connection();
- LogicalByteArray wbuffer = ExtractLobMessage.marshal(ExtractLobMessage.LOB_EXTRACT_BUFFER, lobHandle_, 1, 0,
+ LogicalByteArray wbuffer = ExtractLobMessage.marshal(ExtractLobMessage.LOB_EXTRACT_LEN, lobHandle_, 1, 0,
connection_.ic_);
LogicalByteArray rbuffer = t4connection.getReadBuffer(TRANSPORT.SRVR_API_EXTRACTLOB, wbuffer);
ExtractLobReply reply = new ExtractLobReply(rbuffer, connection_.ic_);
- data_ = reply.lobDataValue;
+ length = reply.lobLength;
+
+ byte[] fetchData_ = new byte[(int) length];
+
+ try {
+ int pos = 0;
+ int chunkSize = 100 * 1024 * 1024;
+ while (pos < length) {
+ int remainSize = (int) (length - pos);
+ int fecthSize = remainSize < chunkSize ? remainSize : chunkSize;
+ wbuffer = ExtractLobMessage.marshal(ExtractLobMessage.LOB_EXTRACT_BUFFER, lobHandle_, 1, fecthSize, connection_.ic_);
+ rbuffer = t4connection.getReadBuffer(TRANSPORT.SRVR_API_EXTRACTLOB, wbuffer);
+ reply = new ExtractLobReply(rbuffer, connection_.ic_);
+ System.arraycopy(reply.extractData, 0, fetchData_, pos, (int) reply.extractLen);
+ pos += reply.extractLen;
+ }
+
+ }
+ catch(SQLException se) {
+ throw se;
+ }
+ finally {
+ // close the LOB cursor
+ wbuffer = ExtractLobMessage.marshal(ExtractLobMessage.LOB_CLOSE_CURSOR, lobHandle_, 1, 0, connection_.ic_);
+ rbuffer = t4connection.getReadBuffer(TRANSPORT.SRVR_API_EXTRACTLOB, wbuffer);
+ reply = new ExtractLobReply(rbuffer, connection_.ic_);
+ }
switch (lobType) {
case Types.BLOB:
- data_ = reply.lobDataValue;
+ data_ = fetchData_;
break;
case Types.CLOB:
try {
- if (reply.lobDataLen == 0) {
+ if (length == 0) {
data_ = "";
}
else {
- data_ = new String(reply.lobDataValue, "UTF-8");
+ data_ = new String(fetchData_, "UTF-8");
}
} catch (UnsupportedEncodingException e) {
throw TrafT4Messages.createSQLException(this.connection_.ic_.t4props_, this.connection_.ic_.getLocale(),
http://git-wip-us.apache.org/repos/asf/trafodion/blob/bd792ff7/core/conn/odbc/src/odbc/nsksrvr/Interface/marshalingsrvr_srvr.cpp
----------------------------------------------------------------------
diff --git a/core/conn/odbc/src/odbc/nsksrvr/Interface/marshalingsrvr_srvr.cpp b/core/conn/odbc/src/odbc/nsksrvr/Interface/marshalingsrvr_srvr.cpp
index 63dfbb7..30b70ba 100644
--- a/core/conn/odbc/src/odbc/nsksrvr/Interface/marshalingsrvr_srvr.cpp
+++ b/core/conn/odbc/src/odbc/nsksrvr/Interface/marshalingsrvr_srvr.cpp
@@ -2307,8 +2307,10 @@ odbc_SQLsrvr_ExtractLob_param_res_(
, char* &buffer
, UInt32& message_length
, const struct odbc_SQLsrvr_ExtractLob_exc_ *exception_
- , IDL_long_long lobDataLen
- , BYTE * lobDataValue
+ , IDL_short extractLobAPI
+ , IDL_long_long lobLength
+ , IDL_long_long extractLen
+ , BYTE * extractData
)
{
CEE_status sts = CEE_SUCCESS;
@@ -2352,13 +2354,20 @@ odbc_SQLsrvr_ExtractLob_param_res_(
break;
}
- // length of IDL_long LOB len
- wlength += sizeof(IDL_long);
- if (lobDataValue != NULL)
- {
- wlength += lobDataLen;
+ wlength += sizeof(IDL_short);
+ switch (extractLobAPI) {
+ case 0:
+ wlength += sizeof(IDL_long_long);
+ break;
+ case 1:
+ wlength += sizeof(IDL_long_long);
+ wlength += extractLen;
+ break;
+ case 2:
+ break;
+ default:
+ break;
}
- wlength += lobDataLen;
// update the length of message
message_length = wlength;
@@ -2394,10 +2403,25 @@ odbc_SQLsrvr_ExtractLob_param_res_(
default:
break;
}
- IDL_long_copy((IDL_long *)&lobDataLen, curptr);
- if (lobDataValue != NULL)
- {
- IDL_byteArray_copy(lobDataValue, lobDataLen, curptr);
+
+ //IDL_long_copy((IDL_long *)&extractLobAPI, curptr);
+ IDL_short_copy((IDL_short *)&extractLobAPI, curptr);
+
+ switch (extractLobAPI) {
+ case 0:
+ IDL_long_long_copy((IDL_long_long *)&lobLength, curptr);
+ break;
+ case 1:
+ IDL_long_long_copy((IDL_long_long *)&extractLen, curptr);
+ if (extractLen != 0)
+ {
+ IDL_byteArray_copy(extractData, extractLen, curptr);
+ }
+ break;
+ case 2:
+ break;
+ default:
+ break;
}
return sts;
http://git-wip-us.apache.org/repos/asf/trafodion/blob/bd792ff7/core/conn/odbc/src/odbc/nsksrvr/Interface/marshalingsrvr_srvr.h
----------------------------------------------------------------------
diff --git a/core/conn/odbc/src/odbc/nsksrvr/Interface/marshalingsrvr_srvr.h b/core/conn/odbc/src/odbc/nsksrvr/Interface/marshalingsrvr_srvr.h
index 8d21291..af3e6ae 100644
--- a/core/conn/odbc/src/odbc/nsksrvr/Interface/marshalingsrvr_srvr.h
+++ b/core/conn/odbc/src/odbc/nsksrvr/Interface/marshalingsrvr_srvr.h
@@ -388,8 +388,10 @@ odbc_SQLsrvr_ExtractLob_param_res_(
, char *&buffer
, UInt32 & message_length
, const struct odbc_SQLsrvr_ExtractLob_exc_ *exception_
- , IDL_long_long lobDataLen
- , BYTE * lobDataValue
+ , IDL_short extractLobAPI
+ , IDL_long_long lobLength
+ , IDL_long_long extractLen
+ , BYTE * extractData
);
CEE_status
http://git-wip-us.apache.org/repos/asf/trafodion/blob/bd792ff7/core/conn/odbc/src/odbc/nsksrvr/Interface/odbcs_srvr.cpp
----------------------------------------------------------------------
diff --git a/core/conn/odbc/src/odbc/nsksrvr/Interface/odbcs_srvr.cpp b/core/conn/odbc/src/odbc/nsksrvr/Interface/odbcs_srvr.cpp
index 5fba9e1..a6f6639 100644
--- a/core/conn/odbc/src/odbc/nsksrvr/Interface/odbcs_srvr.cpp
+++ b/core/conn/odbc/src/odbc/nsksrvr/Interface/odbcs_srvr.cpp
@@ -1526,14 +1526,15 @@ EXTRACTLOB_IOMessage(
IDL_char *curptr;
IDL_long inputPosition = 0;
- IDL_long extractLobAPI = 0;
+ IDL_short extractLobAPI = 0;
+ IDL_long extractLen = 0;
IDL_long lobHandleLen = 0;
IDL_string lobHandle = NULL;
IDL_long lobHandleCharset = 0;
curptr = pnode->r_buffer();
- extractLobAPI = *(IDL_long *)(curptr + inputPosition);
+ extractLobAPI = *(IDL_short *)(curptr + inputPosition);
inputPosition += sizeof(extractLobAPI);
lobHandleLen = *(IDL_long*)(curptr + inputPosition);
@@ -1547,11 +1548,15 @@ EXTRACTLOB_IOMessage(
inputPosition += sizeof(lobHandleCharset);
}
+ extractLen = *(IDL_long *)(curptr + inputPosition);
+ inputPosition += sizeof(extractLen);
+
odbc_SQLSrvr_ExtractLob_ame_(
objtag_,
call_id_,
extractLobAPI,
- lobHandle
+ lobHandle,
+ extractLen
);
}
http://git-wip-us.apache.org/repos/asf/trafodion/blob/bd792ff7/core/conn/odbc/src/odbc/nsksrvr/Interface/odbcs_srvr_res.cpp
----------------------------------------------------------------------
diff --git a/core/conn/odbc/src/odbc/nsksrvr/Interface/odbcs_srvr_res.cpp b/core/conn/odbc/src/odbc/nsksrvr/Interface/odbcs_srvr_res.cpp
index 48602b7..5a34c2c 100644
--- a/core/conn/odbc/src/odbc/nsksrvr/Interface/odbcs_srvr_res.cpp
+++ b/core/conn/odbc/src/odbc/nsksrvr/Interface/odbcs_srvr_res.cpp
@@ -647,8 +647,10 @@ odbc_SQLSrvr_ExtractLob_ts_res_(
/* In */ CEE_tag_def objtag_
, /* In */ const CEE_handle_def *call_id_
, /* In */ const struct odbc_SQLsrvr_ExtractLob_exc_ *exception_
- , /* In */ IDL_long_long lobDataLen
- , /* In */ BYTE *lobDataValue
+ , /* In */ IDL_short extractLobAPI
+ , /* In */ IDL_long_long lobLength
+ , /* In */ IDL_long_long extractLen
+ , /* In */ BYTE * extractData
)
{
CInterface* pnode = (CInterface *)objtag_;
@@ -666,17 +668,19 @@ odbc_SQLSrvr_ExtractLob_ts_res_(
, buffer
, message_length
, exception_
- , lobDataLen
- , lobDataValue
+ , extractLobAPI
+ , lobLength
+ , extractLen
+ , extractData
);
if (sts == CEE_SUCCESS)
sts = pnode->send_response(buffer, message_length, call_id_);
- if (lobDataValue != NULL)
+ if (extractData != NULL)
{
- delete [] lobDataValue;
- lobDataValue = NULL;
+ delete [] extractData;
+ extractData = NULL;
}
return sts;
}
http://git-wip-us.apache.org/repos/asf/trafodion/blob/bd792ff7/core/conn/odbc/src/odbc/nsksrvr/Interface/odbcs_srvr_res.h
----------------------------------------------------------------------
diff --git a/core/conn/odbc/src/odbc/nsksrvr/Interface/odbcs_srvr_res.h b/core/conn/odbc/src/odbc/nsksrvr/Interface/odbcs_srvr_res.h
index fba2e39..7e5f51d 100644
--- a/core/conn/odbc/src/odbc/nsksrvr/Interface/odbcs_srvr_res.h
+++ b/core/conn/odbc/src/odbc/nsksrvr/Interface/odbcs_srvr_res.h
@@ -346,8 +346,10 @@ odbc_SQLSrvr_ExtractLob_ts_res_(
/* In */ CEE_tag_def objtag_
, /* In */ const CEE_handle_def *call_id_
, /* In */ const struct odbc_SQLsrvr_ExtractLob_exc_ *exception_
- , /* In */ IDL_long_long lobDataLen
- , /* In */ BYTE * lobDataValue
+ , /* In */ IDL_short extractLobAPI
+ , /* In */ IDL_long_long lobLength
+ , /* In */ IDL_long_long extractLen
+ , /* In */ BYTE * extractData
);
void
http://git-wip-us.apache.org/repos/asf/trafodion/blob/bd792ff7/core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.cpp
----------------------------------------------------------------------
diff --git a/core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.cpp b/core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.cpp
index 39f363e..fb623e2 100644
--- a/core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.cpp
+++ b/core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.cpp
@@ -8534,12 +8534,13 @@ void
odbc_SQLSrvr_ExtractLob_ame_(
/* In */ CEE_tag_def objtag_
, /* In */ const CEE_handle_def *call_id_
- , /* In */ IDL_long extractLobAPI
- , /* In */ IDL_string lobHandle)
+ , /* In */ IDL_short extractLobAPI
+ , /* In */ IDL_string lobHandle
+ , /* In */ IDL_long_long extractLen)
{
ERROR_DESC_LIST_def sqlWarning = {0, 0};
- IDL_long_long lobDataLen = 0;
- BYTE * lobDataValue = NULL;
+ IDL_long_long lobLength = 0;
+ BYTE * extractData = NULL;
odbc_SQLsrvr_ExtractLob_exc_ exception_ = {0, 0};
@@ -8548,14 +8549,17 @@ odbc_SQLSrvr_ExtractLob_ame_(
&exception_,
extractLobAPI,
lobHandle,
- lobDataLen,
- lobDataValue);
+ lobLength,
+ extractLen,
+ extractData);
odbc_SQLSrvr_ExtractLob_ts_res_(objtag_,
call_id_,
&exception_,
- lobDataLen,
- lobDataValue);
+ extractLobAPI,
+ lobLength,
+ extractLen,
+ extractData);
}
void
http://git-wip-us.apache.org/repos/asf/trafodion/blob/bd792ff7/core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.h
----------------------------------------------------------------------
diff --git a/core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.h b/core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.h
index 66556e8..d429fc8 100644
--- a/core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.h
+++ b/core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.h
@@ -336,8 +336,9 @@ extern "C" void
odbc_SQLSrvr_ExtractLob_ame_(
/* In */ CEE_tag_def objtag_
, /* In */ const CEE_handle_def *call_id_
- , /* In */ IDL_long extractLobAPI
+ , /* In */ IDL_short extractLobAPI
, /* In */ IDL_string lobHandle
+ , /* In */ IDL_long_long extractLen
);
void
http://git-wip-us.apache.org/repos/asf/trafodion/blob/bd792ff7/core/conn/odbc/src/odbc/nsksrvrcore/srvrcommon.h
----------------------------------------------------------------------
diff --git a/core/conn/odbc/src/odbc/nsksrvrcore/srvrcommon.h b/core/conn/odbc/src/odbc/nsksrvrcore/srvrcommon.h
index 6ed6692..ec5315c 100644
--- a/core/conn/odbc/src/odbc/nsksrvrcore/srvrcommon.h
+++ b/core/conn/odbc/src/odbc/nsksrvrcore/srvrcommon.h
@@ -387,8 +387,9 @@ odbc_SQLSrvr_ExtractLob_sme_(
, /* In */ odbc_SQLsrvr_ExtractLob_exc_ *exception_
, /* In */ IDL_long extractLobAPI
, /* In */ IDL_string lobHandle
- , /* In */ IDL_long_long &lobDataLen
- , /* In */ BYTE* &lobDataValue);
+ , /* In */ IDL_long_long &lobLength
+ , /* Out */ IDL_long_long &extractLen
+ , /* Out */ BYTE *& extractData);
extern "C" void
odbc_SQLSrvr_UpdateLob_sme_(
http://git-wip-us.apache.org/repos/asf/trafodion/blob/bd792ff7/core/conn/odbc/src/odbc/nsksrvrcore/srvrothers.cpp
----------------------------------------------------------------------
diff --git a/core/conn/odbc/src/odbc/nsksrvrcore/srvrothers.cpp b/core/conn/odbc/src/odbc/nsksrvrcore/srvrothers.cpp
index ccbb689..af63ca3 100644
--- a/core/conn/odbc/src/odbc/nsksrvrcore/srvrothers.cpp
+++ b/core/conn/odbc/src/odbc/nsksrvrcore/srvrothers.cpp
@@ -6388,13 +6388,14 @@ odbc_SQLSrvr_ExtractLob_sme_(
/* In */ CEE_tag_def objtag_
, /* In */ const CEE_handle_def *call_id_
, /* Out */ odbc_SQLsrvr_ExtractLob_exc_ *exception_
- , /* In */ IDL_long extractLobAPI
+ , /* In */ IDL_short extractLobAPI
, /* In */ IDL_string lobHandle
- , /* Out */ IDL_long_long &lobDataLen
- , /* Out */ BYTE *& lobDataValue
+ , /* In */ IDL_long_long &lobLength
+ , /* Out */ IDL_long_long &extractLen
+ , /* Out */ BYTE *& extractData
)
{
- char LobExtractQuery[1000];
+ char LobExtractQuery[1000] = {0};
char RequestError[200] = {0};
SRVR_STMT_HDL *QryLobExtractSrvrStmt = NULL;
@@ -6411,8 +6412,34 @@ odbc_SQLSrvr_ExtractLob_sme_(
exception_->exception_nr = odbc_SQLsrvr_ExtractLob_ParamError_exn_;
exception_->u.ParamError.ParamDesc = SQLSVC_EXCEPTION_UNABLE_TO_ALLOCATE_SQL_STMT;
}
+FILE * fp= NULL;
+ fp = fopen("/tmp/closeLOB", "a+");
+ switch (extractLobAPI) {
+ case 0:
+ fprintf(fp, "new LOB API\n");
+ extractData = NULL;
+ snprintf(LobExtractQuery, sizeof(LobExtractQuery), "EXTRACT LOBLENGTH(LOB'%s') LOCATION %Ld", lobHandle, (Int64)&lobLength);
+ break;
+ case 1:
+ extractData = new BYTE[extractLen + 1];
+ if (extractData == NULL)
+ {
+ exception_->exception_nr = odbc_SQLsrvr_ExtractLob_ParamError_exn_;
+ exception_->u.ParamError.ParamDesc = SQLSVC_EXCEPTION_BUFFER_ALLOC_FAILED;
+ }
- snprintf(LobExtractQuery, sizeof(LobExtractQuery), "EXTRACT LOBLENGTH(LOB'%s') LOCATION %Ld", lobHandle, (Int64)&lobDataLen);
+ snprintf(LobExtractQuery, sizeof(LobExtractQuery), "EXTRACT LOBTOBUFFER(LOB'%s', LOCATION %Ld, SIZE %Ld)", lobHandle, (Int64)extractData, &extractLen);
+ break;
+ case 102:
+ extractLen = 0;
+ extractData = NULL;
+ snprintf(LobExtractQuery, sizeof(LobExtractQuery), "EXTRACT LOBTOBUFFER(LOB'%s', LOCATION %Ld, SIZE %Ld)", lobHandle, (Int64)extractData, &extractLen);
+ fprintf(fp, "close\n");
+ fclose(fp);
+ break;
+ default:
+ return ;
+ }
try
{
@@ -6446,70 +6473,13 @@ odbc_SQLSrvr_ExtractLob_sme_(
ODBCMX_SERVER,
srvrGlobal->srvrObjRef,
1,
+ //"Exception in executing EXTRACT LOBTOBUFFER");
"Exception in executing EXTRACT LOBLENGTH");
exception_->exception_nr = odbc_SQLsrvr_ExtractLob_ParamError_exn_;
exception_->u.ParamError.ParamDesc = SQLSVC_EXCEPTION_EXECDIRECT_FAILED;
}
- lobDataValue = new BYTE[lobDataLen + 1];
- if (lobDataValue == NULL)
- {
- exception_->exception_nr = odbc_SQLsrvr_ExtractLob_ParamError_exn_;
- exception_->u.ParamError.ParamDesc = SQLSVC_EXCEPTION_BUFFER_ALLOC_FAILED;
- }
-
- memset(lobDataValue, 0, lobDataLen + 1);
-
- memset(LobExtractQuery, 0, sizeof(LobExtractQuery));
-
- snprintf(LobExtractQuery, sizeof(LobExtractQuery), "EXTRACT LOBTOBUFFER(LOB'%s', LOCATION %Ld, SIZE %Ld)", lobHandle, (Int64)lobDataValue, &lobDataLen);
-
- if (exception_->exception_nr == 0)
- {
- try
- {
- short retcode = QryLobExtractSrvrStmt->ExecDirect(NULL, LobExtractQuery, EXTERNAL_STMT, TYPE_CALL, SQL_ASYNC_ENABLE_OFF, 0);
- if (retcode == SQL_ERROR)
- {
- ERROR_DESC_def *p_buffer = QryLobExtractSrvrStmt->sqlError.errorList._buffer;
- strncpy(RequestError, p_buffer->errorText, sizeof(RequestError) - 1);
-
- SendEventMsg(MSG_SQL_ERROR,
- EVENTLOG_ERROR_TYPE,
- srvrGlobal->nskProcessInfo.processId,
- ODBCMX_SERVER,
- srvrGlobal->srvrObjRef,
- 2,
- p_buffer->sqlcode,
- RequestError);
-
- exception_->exception_nr = odbc_SQLsrvr_ExtractLob_ParamError_exn_;
- exception_->u.SQLError.errorList._length = QryLobExtractSrvrStmt->sqlError.errorList._length;
- exception_->u.SQLError.errorList._buffer = QryLobExtractSrvrStmt->sqlError.errorList._buffer;
- exception_->u.ParamError.ParamDesc = SQLSVC_EXCEPTION_EXECUTE_FAILED;
- }
- }
- catch (...)
- {
- SendEventMsg(MSG_PROGRAMMING_ERROR,
- EVENTLOG_ERROR_TYPE,
- srvrGlobal->nskProcessInfo.processId,
- ODBCMX_SERVER,
- srvrGlobal->srvrObjRef,
- 1,
- "Exception in executing EXTRACT LOBTOBUFFER");
-
- exception_->exception_nr = odbc_SQLsrvr_ExtractLob_ParamError_exn_;
- exception_->u.ParamError.ParamDesc = SQLSVC_EXCEPTION_EXECDIRECT_FAILED;
- }
-
- if (exception_->exception_nr != 0) {
- lobDataLen = 0;
- delete [] lobDataValue;
- lobDataValue = NULL;
- }
- }
}
extern "C" void
@@ -6591,6 +6561,9 @@ odbc_SQLSrvr_UpdateLob_sme_(
exception_->u.ParamError.ParamDesc = SQLSVC_EXCEPTION_EXECUTE_FAILED;
}
+ if (QryLobUpdateSrvrStmt != NULL) {
+ QryLobUpdateSrvrStmt->Close(SQL_DROP);
+ }
}
//========================================================================
[29/32] trafodion git commit: Enable LDAP authentication flag at
install time
Posted by li...@apache.org.
Enable LDAP authentication flag at install time
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/a369f0c8
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/a369f0c8
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/a369f0c8
Branch: refs/heads/master
Commit: a369f0c82299ff9feb59be59367c2da986d861bb
Parents: 875cb17
Author: venkat1m <ve...@esgyn.com>
Authored: Fri Feb 16 02:35:33 2018 +0000
Committer: venkat1m <ve...@esgyn.com>
Committed: Fri Feb 16 02:35:33 2018 +0000
----------------------------------------------------------------------
install/python-installer/scripts/traf_ldap.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/a369f0c8/install/python-installer/scripts/traf_ldap.py
----------------------------------------------------------------------
diff --git a/install/python-installer/scripts/traf_ldap.py b/install/python-installer/scripts/traf_ldap.py
index 2d0b9f8..c2e1a48 100755
--- a/install/python-installer/scripts/traf_ldap.py
+++ b/install/python-installer/scripts/traf_ldap.py
@@ -69,7 +69,7 @@ def run():
# err('Failed to access LDAP server with user %s' % db_root_user)
print 'Modfiy sqenvcom.sh to turn on authentication'
- mod_file(sqenv_file, {'TRAFODION_ENABLE_AUTHENTICATION=NO':'TRAFODION_ENABLE_AUTHENTICATION=YES'})
+ mod_file(sqenv_file, {'TRAFODION_ENABLE_AUTHENTICATION=.*':'TRAFODION_ENABLE_AUTHENTICATION=YES'})
# main
try:
[28/32] trafodion git commit: Merge remote branch
'origin/pr/1422/head' into merge_1422
Posted by li...@apache.org.
Merge remote branch 'origin/pr/1422/head' into merge_1422
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/875cb170
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/875cb170
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/875cb170
Branch: refs/heads/master
Commit: 875cb17004fd29ad5534fc50925f1c40e666a31d
Parents: 0d68dfe 2a6282c
Author: Sandhya Sundaresan <sa...@apache.org>
Authored: Sat Feb 3 03:22:58 2018 +0000
Committer: Sandhya Sundaresan <sa...@apache.org>
Committed: Sat Feb 3 03:22:58 2018 +0000
----------------------------------------------------------------------
install/python-installer/scripts/hdfs_cmds.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[05/32] trafodion git commit: Changes to take care of closing
internal cursor statement when extract operation is done and the exact length
of data is passed in to be extracted.
Posted by li...@apache.org.
Changes to take care of closing internal cursor statement when extract operation is done and the exact length of data is passed in to be extracted.
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/89576f3d
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/89576f3d
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/89576f3d
Branch: refs/heads/master
Commit: 89576f3dc7f5e37977ec3cdd9f0fd5ecadee0d36
Parents: d538162
Author: Sandhya Sundaresan <sa...@apache.org>
Authored: Tue Aug 22 17:38:42 2017 +0000
Committer: Sandhya Sundaresan <sa...@apache.org>
Committed: Tue Aug 22 17:38:42 2017 +0000
----------------------------------------------------------------------
core/sql/executor/ExExeUtil.h | 2 +-
core/sql/executor/ExExeUtilLoad.cpp | 26 ++------------------------
core/sql/exp/ExpLOBaccess.cpp | 11 +++++++++--
3 files changed, 12 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/89576f3d/core/sql/executor/ExExeUtil.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExExeUtil.h b/core/sql/executor/ExExeUtil.h
index 51695c6..1ca9c97 100644
--- a/core/sql/executor/ExExeUtil.h
+++ b/core/sql/executor/ExExeUtil.h
@@ -2978,7 +2978,7 @@ public:
char * lobData2_;
Int64 lobDataSpecifiedExtractLen_;
Int64 lobDataLen_;
- Lng32 remainingBytes_;
+ Int64 remainingBytes_;
Lng32 currPos_;
Lng32 numChildRows_;
Int64 requestTag_;
http://git-wip-us.apache.org/repos/asf/trafodion/blob/89576f3d/core/sql/executor/ExExeUtilLoad.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExExeUtilLoad.cpp b/core/sql/executor/ExExeUtilLoad.cpp
index dfbbac4..45a15e5 100644
--- a/core/sql/executor/ExExeUtilLoad.cpp
+++ b/core/sql/executor/ExExeUtilLoad.cpp
@@ -3246,7 +3246,7 @@ short ExExeUtilLobExtractTcb::work()
break;
}
- remainingBytes_ = (Lng32)lobDataOutputLen;
+ remainingBytes_ = lobDataOutputLen;
currPos_ = 0;
@@ -3309,33 +3309,11 @@ short ExExeUtilLobExtractTcb::work()
getLobErrStr(intParam1));
step_ = HANDLE_ERROR_;
break;
- }
+ }
step_ = DONE_;
}
break;
-
- case RETURN_STRING_:
- {
- if (qparent_.up->isFull())
- return WORK_OK;
-
- Lng32 size = MINOF((Lng32)lobTdb().dataExtractSizeIOAddr(), (Lng32)remainingBytes_);
-
- moveRowToUpQueue(&lobData_[currPos_], size);
-
- remainingBytes_ -= size;
- currPos_ += size;
-
- if (remainingBytes_ <= 0)
- {
- step_ = READ_CURSOR_;
- qparent_.down->removeHead();
- }
-
- return WORK_RESCHEDULE_AND_RETURN;
- }
- break;
case RETURN_STATUS_:
{
http://git-wip-us.apache.org/repos/asf/trafodion/blob/89576f3d/core/sql/exp/ExpLOBaccess.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpLOBaccess.cpp b/core/sql/exp/ExpLOBaccess.cpp
index 3764752..9478c64 100644
--- a/core/sql/exp/ExpLOBaccess.cpp
+++ b/core/sql/exp/ExpLOBaccess.cpp
@@ -1949,7 +1949,7 @@ Ex_Lob_Error ExLob::readCursorData(char *tgt, Int64 tgtSize, cursor_t &cursor, I
char logBuf[4096];
lobDebugInfo("In ExLob::readCursorData",0,__LINE__,lobTrace_);
- while ( (operLen < tgtSize) && !cursor.eod_ )
+ while ( (operLen <= tgtSize) && !cursor.eod_ )
{
if (cursor.bytesRead_ == cursor.descSize_) // time to read next chunck
@@ -1970,7 +1970,14 @@ Ex_Lob_Error ExLob::readCursorData(char *tgt, Int64 tgtSize, cursor_t &cursor, I
continue;
}
}
-
+ if (operLen == tgtSize)
+ {
+ //The cursor still has data available but wait until redrive since
+ //we have fetched all the data for this extract operation
+ hdfsCloseFile(fs_, fdData_);
+ fdData_ = NULL;
+ return LOB_OPER_OK;
+ }
bytesAvailable = cursor.descSize_ - cursor.bytesRead_;
bytesToCopy = min(bytesAvailable, tgtSize - operLen);
offset = cursor.descOffset_ + cursor.bytesRead_;
[30/32] trafodion git commit: Merge [TRAFODION-2962] PR 1448 Enable
LDAP auth flag at install time
Posted by li...@apache.org.
Merge [TRAFODION-2962] PR 1448 Enable LDAP auth flag at install time
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/b4601067
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/b4601067
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/b4601067
Branch: refs/heads/master
Commit: b46010674a0321110f47062702b4a88559c4b215
Parents: 875cb17 a369f0c
Author: Dave Birdsall <db...@apache.org>
Authored: Fri Feb 16 20:03:47 2018 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Fri Feb 16 20:03:47 2018 +0000
----------------------------------------------------------------------
install/python-installer/scripts/traf_ldap.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[16/32] trafodion git commit: [TRAFODION-2740]add property to set the
LOB chunk size
Posted by li...@apache.org.
[TRAFODION-2740]add property to set the LOB chunk size
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/835a4894
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/835a4894
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/835a4894
Branch: refs/heads/master
Commit: 835a48945afe3cc19ec58ac94e22b323db69d5cf
Parents: ea80ab3
Author: Weiqing Xu <we...@esgyn.cn>
Authored: Sat Sep 23 17:47:33 2017 +0000
Committer: Weiqing Xu <we...@esgyn.cn>
Committed: Sat Sep 23 17:47:33 2017 +0000
----------------------------------------------------------------------
.../org/trafodion/jdbc/t4/T4Properties.java | 28 +++++++++++++++++++-
.../java/org/trafodion/jdbc/t4/TrafT4Lob.java | 4 +--
.../org/trafodion/jdbc/t4/T4DriverTest.java | 28 ++++++++++++++++++++
3 files changed, 57 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/835a4894/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/T4Properties.java
----------------------------------------------------------------------
diff --git a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/T4Properties.java b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/T4Properties.java
index 917cf45..202bc27 100644
--- a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/T4Properties.java
+++ b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/T4Properties.java
@@ -119,7 +119,9 @@ public class T4Properties {
String clobTableName_;
String blobTableName_;
- // private short transportBufferSize_;
+ private int lobChunkSize_ = 10; // default 10M
+
+ // private short transportBufferSize_;
private boolean useArrayBinding_;
private boolean batchRecovery_;
private final String propPrefix_ = "t4jdbc.";
@@ -425,6 +427,8 @@ public class T4Properties {
setKeepAlive(getProperty("keepAlive"));
setTokenAuth(getProperty("tokenAuth"));
setTcpNoDelay(getProperty("tcpNoDelay"));
+
+ setLobChunkSize(getProperty("lobChunkSize"));
}
T4Properties getT4Properties() {
@@ -518,6 +522,8 @@ public class T4Properties {
props.setProperty("tokenAuth", String.valueOf(_tokenAuth));
props.setProperty("tcpNoDelay", String.valueOf(_tcpNoDelay));
+ props.setProperty("lobChunkSize", String.valueOf(lobChunkSize_));
+
return props;
}
@@ -1884,6 +1890,26 @@ public class T4Properties {
return reserveDataLocator_;
}
+ public int getLobChunkSize() {
+ return lobChunkSize_;
+ }
+
+ public void setLobChunkSize(int lobChunkSize_) {
+ this.lobChunkSize_ = lobChunkSize_;
+ }
+
+ public void setLobChunkSize(String val) {
+ this.lobChunkSize_ = 10;
+ if (val != null) {
+ try {
+ this.lobChunkSize_ = Integer.parseInt(val);
+ } catch (NumberFormatException ex) {
+ sqlExceptionMessage_ = "Incorrect value for setLobChunkSize set: " + val + ex.getMessage();
+ this.lobChunkSize_ = 10;
+ }
+ }
+ }
+
/**
* Returns the rounding mode set for the driver as an Integer value with one
* of the following values. static int ROUND_CEILING Rounding mode to round
http://git-wip-us.apache.org/repos/asf/trafodion/blob/835a4894/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4Lob.java
----------------------------------------------------------------------
diff --git a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4Lob.java b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4Lob.java
index f18377b..0643173 100644
--- a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4Lob.java
+++ b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4Lob.java
@@ -103,7 +103,7 @@ public abstract class TrafT4Lob {
try {
int pos = 0;
- int chunkSize = 100 * 1024 * 1024;
+ int chunkSize = connection_.props_.getLobChunkSize() * 1024 * 1024;
while (pos < length) {
int remainSize = (int) (length - pos);
int fecthSize = remainSize < chunkSize ? remainSize : chunkSize;
@@ -153,7 +153,7 @@ public abstract class TrafT4Lob {
return ;
T4Connection t4connection = this.connection_.getServerHandle().getT4Connection();
- final long chunkSize = 100 * 1024 * 1024;
+ final long chunkSize = connection_.props_.getLobChunkSize() * 1024 * 1024;
LogicalByteArray wbuffer = null;
byte[] valueBuffer = null;
http://git-wip-us.apache.org/repos/asf/trafodion/blob/835a4894/core/conn/jdbcT4/src/test/java/org/trafodion/jdbc/t4/T4DriverTest.java
----------------------------------------------------------------------
diff --git a/core/conn/jdbcT4/src/test/java/org/trafodion/jdbc/t4/T4DriverTest.java b/core/conn/jdbcT4/src/test/java/org/trafodion/jdbc/t4/T4DriverTest.java
index e44c97a..e158e7b 100644
--- a/core/conn/jdbcT4/src/test/java/org/trafodion/jdbc/t4/T4DriverTest.java
+++ b/core/conn/jdbcT4/src/test/java/org/trafodion/jdbc/t4/T4DriverTest.java
@@ -23,7 +23,12 @@
package org.trafodion.jdbc.t4;
+import java.sql.Blob;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
import java.sql.SQLException;
+import java.sql.Statement;
import org.junit.Assert;
import org.junit.BeforeClass;
@@ -39,6 +44,29 @@ public class T4DriverTest {
@Test
+ public void readLob() throws SQLException {
+ Connection conn = null;
+ try {
+ conn = DriverManager.getConnection("jdbc:t4jdbc://192.168.0.36:23400/:", "zz", "zz");
+ Statement stmt = conn.createStatement();
+ ResultSet rs = stmt.executeQuery("select c2 from tlob");
+ while (rs.next()) {
+ Blob blob = rs.getBlob(1);
+ System.out.println("LOB length " + blob.length());
+ System.out.println(new String(blob.getBytes(1, (int)blob.length())));
+ }
+ conn.close();
+ conn = null;
+ }
+ catch (SQLException se) {
+ System.out.println(se.getMessage());
+ }
+ finally {
+ if (conn != null)
+ conn.close();
+ }
+ }
+ @Test
public void acceptsURL() throws SQLException {
String url = "jdbc:t4jdbc://localhost:23400/:";
Assert.assertTrue(driver.acceptsURL(url));
[15/32] trafodion git commit: [TRAFODION-2740]remove unused code
Posted by li...@apache.org.
[TRAFODION-2740]remove unused code
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/ea80ab38
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/ea80ab38
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/ea80ab38
Branch: refs/heads/master
Commit: ea80ab383da807fe4fd61d9a9193c08ad2c79283
Parents: bd792ff
Author: Weiqing Xu <we...@esgyn.cn>
Authored: Fri Sep 22 16:44:40 2017 +0000
Committer: Weiqing Xu <we...@esgyn.cn>
Committed: Fri Sep 22 16:44:40 2017 +0000
----------------------------------------------------------------------
core/conn/odbc/src/odbc/nsksrvrcore/srvrothers.cpp | 5 -----
1 file changed, 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/ea80ab38/core/conn/odbc/src/odbc/nsksrvrcore/srvrothers.cpp
----------------------------------------------------------------------
diff --git a/core/conn/odbc/src/odbc/nsksrvrcore/srvrothers.cpp b/core/conn/odbc/src/odbc/nsksrvrcore/srvrothers.cpp
index af63ca3..a6e3c2b 100644
--- a/core/conn/odbc/src/odbc/nsksrvrcore/srvrothers.cpp
+++ b/core/conn/odbc/src/odbc/nsksrvrcore/srvrothers.cpp
@@ -6412,11 +6412,8 @@ odbc_SQLSrvr_ExtractLob_sme_(
exception_->exception_nr = odbc_SQLsrvr_ExtractLob_ParamError_exn_;
exception_->u.ParamError.ParamDesc = SQLSVC_EXCEPTION_UNABLE_TO_ALLOCATE_SQL_STMT;
}
-FILE * fp= NULL;
- fp = fopen("/tmp/closeLOB", "a+");
switch (extractLobAPI) {
case 0:
- fprintf(fp, "new LOB API\n");
extractData = NULL;
snprintf(LobExtractQuery, sizeof(LobExtractQuery), "EXTRACT LOBLENGTH(LOB'%s') LOCATION %Ld", lobHandle, (Int64)&lobLength);
break;
@@ -6434,8 +6431,6 @@ FILE * fp= NULL;
extractLen = 0;
extractData = NULL;
snprintf(LobExtractQuery, sizeof(LobExtractQuery), "EXTRACT LOBTOBUFFER(LOB'%s', LOCATION %Ld, SIZE %Ld)", lobHandle, (Int64)extractData, &extractLen);
- fprintf(fp, "close\n");
- fclose(fp);
break;
default:
return ;
[12/32] trafodion git commit: Merge remote branch
'origin/pr/1230/head' into merge_1230
Posted by li...@apache.org.
Merge remote branch 'origin/pr/1230/head' into merge_1230
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/42b2b0b4
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/42b2b0b4
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/42b2b0b4
Branch: refs/heads/master
Commit: 42b2b0b4a56e9b125d15eaa227976d11dcec1b3c
Parents: 615b8dd e8c09eb
Author: Sandhya Sundaresan <sa...@apache.org>
Authored: Tue Sep 12 17:51:49 2017 +0000
Committer: Sandhya Sundaresan <sa...@apache.org>
Committed: Tue Sep 12 17:51:49 2017 +0000
----------------------------------------------------------------------
core/sql/cli/Cli.cpp | 48 ++++++++++++++++------------
core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 5 ++-
2 files changed, 31 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
[03/32] trafodion git commit: cherry pick add alter column 2
Posted by li...@apache.org.
cherry pick add alter column 2
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/08b41edb
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/08b41edb
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/08b41edb
Branch: refs/heads/master
Commit: 08b41edb08d313ed524e64392271d17c38ee9b19
Parents: a465ec8
Author: liu.yu <yu...@esgyn.cn>
Authored: Mon Aug 14 11:56:00 2017 +0800
Committer: liu.yu <yu...@esgyn.cn>
Committed: Tue Aug 22 11:44:19 2017 +0800
----------------------------------------------------------------------
.../sql_functions_and_expressions.adoc | 2 +-
.../src/asciidoc/_chapters/sql_statements.adoc | 62 +++++++++++++++++---
2 files changed, 54 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/08b41edb/docs/sql_reference/src/asciidoc/_chapters/sql_functions_and_expressions.adoc
----------------------------------------------------------------------
diff --git a/docs/sql_reference/src/asciidoc/_chapters/sql_functions_and_expressions.adoc b/docs/sql_reference/src/asciidoc/_chapters/sql_functions_and_expressions.adoc
index 27d9f2c..fc81e08 100644
--- a/docs/sql_reference/src/asciidoc/_chapters/sql_functions_and_expressions.adoc
+++ b/docs/sql_reference/src/asciidoc/_chapters/sql_functions_and_expressions.adoc
@@ -2523,7 +2523,7 @@ timestamp or a date expression.
DATE_PART is a {project-name} extension.
```
-DATEPART(text, datetime-expr)
+DATE_PART(text, datetime-expr)
```
* `_text_`
http://git-wip-us.apache.org/repos/asf/trafodion/blob/08b41edb/docs/sql_reference/src/asciidoc/_chapters/sql_statements.adoc
----------------------------------------------------------------------
diff --git a/docs/sql_reference/src/asciidoc/_chapters/sql_statements.adoc b/docs/sql_reference/src/asciidoc/_chapters/sql_statements.adoc
index 354a3c3..e8f446e 100644
--- a/docs/sql_reference/src/asciidoc/_chapters/sql_statements.adoc
+++ b/docs/sql_reference/src/asciidoc/_chapters/sql_statements.adoc
@@ -377,21 +377,19 @@ To run this statement, AUTOCOMMIT must be turned ON (the default) for the sessio
ALTER TABLE name alter-action
alter-action is:
-
ADD [IF NOT EXISTS][COLUMN] column-definition
| ADD [CONSTRAINT constraint-name] table-constraint
| DROP CONSTRAINT constraint-name [RESTRICT]
| RENAME TO new-name
| DROP COLUMN [IF EXISTS] column-name
+ | ALTER COLUMN column-definition
column-definition is:
-
column-name data-type
([DEFAULT default]
[[constraint constraint-name] column-constraint])
data-type is:
-
char[acter] [(length)[characters]]
[CHARACTER SET char-set-name]
[UPSHIFT] [[not] casespecific]
@@ -418,7 +416,6 @@ data-type is:
| interval { start-field to end-field | single-field }
default is:
-
literal
| null
| currentdate
@@ -426,24 +423,20 @@ default is:
| currenttimestamp }
column-constraint is:
-
not null
| unique
| check (condition)
| references ref-spec
table-constraint is:
-
unique (column-list)
| check (condition)
| foreign key (column-list) references ref-spec
ref-spec is:
-
referenced-table [(column-list)]
column-list is:
-
column-name[, column-name]...
```
@@ -616,6 +609,16 @@ the clauses for the _column-definition_ are the same as described in add [column
+
drops the specified column from _table_, including the column’s data. you cannot drop a primary key column.
+* `alter column _column-definition_`
++
+alters the data-type of a column in an existing Trafodion table. The following conditions have to be met, else SQL error 1404 will be returned.
+
+** the old (existing) column datatype and new column datatype must be VARCHAR (variable length string datatype).
+** new column length must be greater than or equal to old column length.
+** old and new character sets must be the same.
+** altered columns cannot be part of primary key or secondary index key.
+** table cannot be a VOLATILE table.
+
<<<
[[alter_table_considerations]]
=== Considerations for ALTER TABLE
@@ -655,7 +658,7 @@ If the constraint refers to the other table in a query expression, you must also
[[alter_table_examples]]
=== Example of ALTER TABLE
-This example adds a column:
+* This example adds a column.
```
ALTER TABLE persnl.project
@@ -663,6 +666,47 @@ ALTER TABLE persnl.project
NUMERIC (4) UNSIGNED
```
+
+* This example alters a column of an existing table – showing both positive and negative cases.
+
+```
+>>INVOKE T;
+
+-- Definition of Trafodion table TRAFODION.SEABASE.T
+-- Definition current Wed Jul 8 01:28:40 2015
+
+ (
+ SYSKEY LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
+ , A INT NO DEFAULT NOT NULL NOT DROPPABLE
+ , B VARCHAR(30) CHARACTER SET ISO88591 COLLATE
+ DEFAULT DEFAULT NULL
+ )
+
+--- SQL operation complete.
+>>ALTER TABLE T ALTER COLUMN B VARCHAR(40);
+
+--- SQL operation complete.
+>>INVOKE T;
+
+-- Definition of Trafodion table TRAFODION.SEABASE.T
+-- Definition current Wed Jul 8 01:29:03 2015
+
+ (
+ SYSKEY LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
+ , A INT NO DEFAULT NOT NULL NOT DROPPABLE
+ , B VARCHAR(40) CHARACTER SET ISO88591 COLLATE
+ DEFAULT DEFAULT NULL
+ )
+
+--- SQL operation complete.
+>>ALTER TABLE T ALTER COLUMN B VARCHAR(30);
+
+*** ERROR[1404] Datatype for column B cannot be altered.
+
+--- SQL operation failed with errors.
+```
+
+
<<<
[[alter_user_statement]]
== ALTER USER Statement