You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by db...@apache.org on 2016/05/16 17:40:36 UTC
[1/5] incubator-trafodion git commit: Support in sqludflog reader to
read REST server logs
Repository: incubator-trafodion
Updated Branches:
refs/heads/master 439437b74 -> 8110b8d88
Support in sqludflog reader to read REST server logs
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/9fa9b611
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/9fa9b611
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/9fa9b611
Branch: refs/heads/master
Commit: 9fa9b61136bf2bed3ef18e91c12257c936da7105
Parents: 9b90f23
Author: Anuradha Hegde <an...@esgyn.com>
Authored: Tue May 3 16:32:01 2016 +0000
Committer: Anuradha Hegde <an...@esgyn.com>
Committed: Tue May 3 16:32:01 2016 +0000
----------------------------------------------------------------------
core/rest/bin/rest-daemon.sh | 3 ---
core/rest/conf/log4j.properties | 2 +-
core/sqf/sql/scripts/genms | 3 +++
core/sql/sqludr/SqlUdrPredefLogReader.cpp | 20 +++++++++++++++++---
4 files changed, 21 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9fa9b611/core/rest/bin/rest-daemon.sh
----------------------------------------------------------------------
diff --git a/core/rest/bin/rest-daemon.sh b/core/rest/bin/rest-daemon.sh
index 210150f..fcc0d16 100755
--- a/core/rest/bin/rest-daemon.sh
+++ b/core/rest/bin/rest-daemon.sh
@@ -153,9 +153,6 @@ case $startStop in
rest_rotate_log $logout
rest_rotate_log $loggc
echo starting $command, logging to $logout
- # Add to the command log file vital stats on our environment.
- echo "`date` Starting $command on `hostname`" >> $loglog
- echo "`ulimit -a`" >> $loglog 2>&1
nohup nice -n $REST_NICENESS "$REST_HOME"/bin/rest \
--config "${REST_CONF_DIR}" \
$command "$@" $startStop > "$logout" 2>&1 < /dev/null &
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9fa9b611/core/rest/conf/log4j.properties
----------------------------------------------------------------------
diff --git a/core/rest/conf/log4j.properties b/core/rest/conf/log4j.properties
index dc00816..4c1edf1 100644
--- a/core/rest/conf/log4j.properties
+++ b/core/rest/conf/log4j.properties
@@ -76,7 +76,7 @@ log4j.appender.NullAppender=org.apache.log4j.varia.NullAppender
log4j.appender.console=org.apache.log4j.ConsoleAppender
log4j.appender.console.target=System.out
log4j.appender.console.layout=org.apache.log4j.PatternLayout
-log4j.appender.console.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss} %p %c{2}: %m%n
+log4j.appender.DRFA.layout.ConversionPattern=%d{ISO8601}, %p, %c, Node Number: , CPU: , PID: , Process Name: , , ,%m%n
# Custom Logging levels
# Disable ZooKeeper/hbase events
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9fa9b611/core/sqf/sql/scripts/genms
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/genms b/core/sqf/sql/scripts/genms
index 845058a..d102a2a 100755
--- a/core/sqf/sql/scripts/genms
+++ b/core/sqf/sql/scripts/genms
@@ -202,6 +202,9 @@ echo "CACERTS_DIR=$cacertsdir"
dcsinstalldir=$DCS_INSTALL_DIR
echo "DCS_INSTALL_DIR=$dcsinstalldir"
+restinstalldir=$REST_INSTALL_DIR
+echo "REST_INSTALL_DIR=$restinstalldir"
+
echo ""
echo ""
echo "# Added by gensq.pl"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9fa9b611/core/sql/sqludr/SqlUdrPredefLogReader.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqludr/SqlUdrPredefLogReader.cpp b/core/sql/sqludr/SqlUdrPredefLogReader.cpp
index b9e54f7..47d0e51 100644
--- a/core/sql/sqludr/SqlUdrPredefLogReader.cpp
+++ b/core/sql/sqludr/SqlUdrPredefLogReader.cpp
@@ -474,7 +474,7 @@ void ReadCppEventsUDFInterface::processData(UDRInvocationInfo &info,
char *ok = NULL; // status of fgets
int haveRowToEmit = 0;
int appendPos = 0;
- int numLogLocations = 2 ;
+ int numLogLocations = 3 ;
for(int logLocationIndex = 0; logLocationIndex < numLogLocations; logLocationIndex++)
{
@@ -493,6 +493,13 @@ void ReadCppEventsUDFInterface::processData(UDRInvocationInfo &info,
else if (strlen(logrootdir) > 1000)
throw UDRException(38001, "DCS_INSTALL_DIR is longer than 1000 characters");
break ;
+ case 2:
+ logrootdir = getenv("REST_INSTALL_DIR");
+ if (!logrootdir)
+ throw UDRException(38001, "REST_INSTALL_DIR not set");
+ else if (strlen(logrootdir) > 1000)
+ throw UDRException(38001, "REST_INSTALL_DIR is longer than 1000 characters");
+ break ;
default:
throw UDRException(38001, "Internal error in determining logroot directory");
}
@@ -521,11 +528,17 @@ void ReadCppEventsUDFInterface::processData(UDRInvocationInfo &info,
logDir_ = opendir(logDirName.data());
if (logDir_ == NULL)
+ {
+ //rest server logs are only on master node
+ //If udr runs on diff node, ignore if rest log folder does not exist
+ if(logLocationIndex == 2)
+ continue;
+
throw UDRException(
38002,
"Error %d on opening directory %s",
(int) errno, logDirName.data());
-
+ }
cFile = fopen(confFileName.data(), "r");
if (cFile)
{
@@ -620,7 +633,8 @@ void ReadCppEventsUDFInterface::processData(UDRInvocationInfo &info,
strstr(fileName, "pstartd") == fileName ||
strstr(fileName, "wdg") == fileName ||
strstr(fileName, "udr_") == fileName ||
- strstr(fileName, "dcs-") == fileName
+ strstr(fileName, "dcs-") == fileName ||
+ strstr(fileName, "rest-") == fileName
))
{
if (infile_ != NULL)
[5/5] incubator-trafodion git commit: Merge [TRAFODION-1954] PR 474
Enhance version command for sqlci
Posted by db...@apache.org.
Merge [TRAFODION-1954] PR 474 Enhance version command for sqlci
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/8110b8d8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/8110b8d8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/8110b8d8
Branch: refs/heads/master
Commit: 8110b8d88a29211b12022c3a93ac6c72b8d81ee0
Parents: 439437b 2e6e354
Author: Dave Birdsall <db...@apache.org>
Authored: Mon May 16 17:39:31 2016 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Mon May 16 17:39:31 2016 +0000
----------------------------------------------------------------------
core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.cpp | 39 ++++++++++++++---
.../src/org/trafodion/ci/InterfaceQuery.java | 46 ++++++++------------
.../src/org/trafodion/ci/ParseArguments.java | 4 +-
.../trafci/src/org/trafodion/ci/Session.java | 39 ++++++++---------
.../src/org/trafodion/ci/SessionDefaults.java | 1 +
.../src/org/trafodion/ci/UserInterface.java | 2 +-
core/conn/trafci/utils/trafci | 8 ++++
core/rest/bin/rest-daemon.sh | 3 --
core/rest/conf/log4j.properties | 2 +-
core/sqf/sql/scripts/genms | 3 ++
core/sql/sqludr/SqlUdrPredefLogReader.cpp | 20 +++++++--
11 files changed, 101 insertions(+), 66 deletions(-)
----------------------------------------------------------------------
[4/5] incubator-trafodion git commit: version command now displays
information from the server
Posted by db...@apache.org.
version command now displays information from the server
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/2e6e3545
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/2e6e3545
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/2e6e3545
Branch: refs/heads/master
Commit: 2e6e3545ac07da908a0ce456454660507ba24712
Parents: e4791e7
Author: Anuradha Hegde <an...@esgyn.com>
Authored: Mon May 9 20:20:00 2016 +0000
Committer: Anuradha Hegde <an...@esgyn.com>
Committed: Mon May 9 20:20:00 2016 +0000
----------------------------------------------------------------------
core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.cpp | 39 ++++++++++++++---
.../src/org/trafodion/ci/InterfaceQuery.java | 46 ++++++++------------
.../src/org/trafodion/ci/ParseArguments.java | 4 +-
.../trafci/src/org/trafodion/ci/Session.java | 39 ++++++++---------
.../src/org/trafodion/ci/SessionDefaults.java | 1 +
.../src/org/trafodion/ci/UserInterface.java | 2 +-
core/conn/trafci/utils/trafci | 8 ++++
7 files changed, 80 insertions(+), 59 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/2e6e3545/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 86d5df3..2ad8422 100644
--- a/core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.cpp
+++ b/core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.cpp
@@ -208,13 +208,17 @@ typedef struct _REPOS_STATS
#include "ndcsversion.h"
-//LCOV_EXCL_START
// Needed for bypassing checks in compiler once component privileges have been tested
// Internal calls - Defined in libcli.so
void SQL_EXEC_SetParserFlagsForExSqlComp_Internal( /*IN*/ unsigned int flagbits);
void SQL_EXEC_ResetParserFlagsForExSqlComp_Internal( /*IN*/ unsigned int flagbits);
-//LCOV_EXCL_STOP
+
+Int32 SQL_EXEC_GetAuthState(
+ /*OUT*/ bool &authenticationEnabled,
+ /*OUT*/ bool &authorizationEnabled,
+ /*OUT*/ bool &authorizationReady,
+ /*OUT*/ bool &auditingEnabled);
#define SKIP_COMPRIV_CHECK 0x100000
@@ -8615,24 +8619,45 @@ bool isInfoSystem(char*& sqlString, const IDL_char *stmtLabel, short& error)
static char buffer[4000];
char* in = sqlString;
SRVR_STMT_HDL *pSrvrStmt = NULL;
-
+ char *databaseVersion;
+
+ databaseVersion = getenv("TRAFODION_VER");
// get Timezone and GMT offset
time_t tim = time(NULL);
struct tm *now = localtime(&tim);
+ string databaseEdition = getenv("TRAFODION_VER_PROD");
+
+ bool authenticationEnabled = false;
+ bool authorizationEnabled = false;
+ bool authorizationReady = false;
+ bool auditingEnabled = false;
+
+ Int32 rc = SQL_EXEC_GetAuthState(authenticationEnabled,
+ authorizationEnabled,
+ authorizationReady,
+ auditingEnabled);
+
char pattern[] = "SELECT [first 1]"
"current_timestamp as \"CURRENT_TIME\","
"'%s' as \"NDCS_VERSION\","
"'%s' as \"TM_ZONE\","
- "'%d' as \"TM_GMTOFF_SEC\""
-// "FROM hp_system_catalog.mxcs_schema.datasources FOR READ UNCOMMITTED ACCESS;";
- "FROM (values(1)) X(A);";
+ "'%d' as \"TM_GMTOFF_SEC\","
+ "'%s' as \"DATABASE_VERSION\","
+ "'%s' as \"DATABASE_EDITION\","
+ "'%s' as \"AUTHENTICATION_ENABLED\","
+ "'%s' as \"AUTHORIZATION_ENABLED\""
+ "FROM (values(1)) X(A);";
sprintf (buffer, pattern,
ndcs_vers_str(),
now->tm_zone,
- now->tm_gmtoff);
+ now->tm_gmtoff,
+ databaseVersion,
+ databaseEdition.c_str(),
+ authenticationEnabled ? "true" : "false",
+ authorizationEnabled ? "true" : "false");
// other comments:
// the repository view does not exist - maybe a M6 item
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/2e6e3545/core/conn/trafci/src/org/trafodion/ci/InterfaceQuery.java
----------------------------------------------------------------------
diff --git a/core/conn/trafci/src/org/trafodion/ci/InterfaceQuery.java b/core/conn/trafci/src/org/trafodion/ci/InterfaceQuery.java
index 95a3a33..5bd73cb 100644
--- a/core/conn/trafci/src/org/trafodion/ci/InterfaceQuery.java
+++ b/core/conn/trafci/src/org/trafodion/ci/InterfaceQuery.java
@@ -2333,30 +2333,21 @@ public class InterfaceQuery extends QueryWrapper implements SessionDefaults {
private void displayVersionInfo(boolean srvrErrMsg) throws IOException {
String platformVersion = sessObj.getSutVersion();
- String mxoSrvrVersion = sessObj.getNdcsVersion();
-
- if (platformVersion != null && !platformVersion.startsWith("*ERROR*")
- && !platformVersion.startsWith("An internal server error")) {
- handleOutput("Trafodion Platform :", platformVersion);
- } else
- handleOutput("Trafodion Platform :",
- this.infoNotAvailable);
-
- if (mxoSrvrVersion != null && !mxoSrvrVersion.equals(""))
- handleOutput("Trafodion Connectivity Services :",
- mxoSrvrVersion.trim(), false);
- else
- handleOutput("Trafodion Connectivity Services :",
- this.infoNotAvailable, false);
-
- handleOutput("Trafodion JDBC Type 4 Driver :", JDBCVproc.getVproc(),
- false);
- handleOutput(SessionDefaults.PROD_NAME + " :", Vproc.getVproc(), false);
-
+ String mxoSrvrVersion = sessObj.getNdcsVersion();
+ String databaseVersion = sessObj.getDatabaseVersion();
+ String databaseEdition = sessObj.getDatabaseEdition();
+
+ if (databaseVersion != null && databaseEdition != null) {
+ handleOutput("Database Version : Release ", databaseVersion);
+ handleOutput("Database Edition :", databaseEdition,false);
+ } else {
+ handleOutput("Database Version :", this.infoNotAvailable, false);
+ handleOutput("Database Edition :", this.infoNotAvailable, false);
+ }
+ handleOutput("JDBC Type 4 Driver Build ID :", JDBCVproc.getVproc(), false);
+ handleOutput("Command Interface Build ID :", Vproc.getVproc(), false);
+
writer.writeEndTags(sessObj);
-
- if ((srvrErrMsg) && (sessObj.getT4verNum() >= 2.2))
- sessionError('E', SessionError.SERVER_PRODUCT_ERR);
}
private void handleConnect() throws IOException, UserInterruption {
@@ -2495,14 +2486,14 @@ public class InterfaceQuery extends QueryWrapper implements SessionDefaults {
sessObj.setStmtObj(siObj.getStatement(newConn));
sessObj.qsOpen = false;
sessObj.setDBConnExists(true);
+ boolean trafver = sessObj.getPlatformObjectVersions();
// Uncomment this line if you need to reset role to DEFAULT;
// TempSessionRole is set using SET CONNECTIOPT command
// sessObj.setTempSessionRole("");
-
//writer.writeln();
- writer.writeln("Connected to Trafodion "
-);
+
+ writer.writeln("Connected to " + sessObj.getDatabaseEdition());
sessObj.setQryEndTime();
if (printConnTime) {
@@ -2619,8 +2610,9 @@ public class InterfaceQuery extends QueryWrapper implements SessionDefaults {
sessObj.setStmtObj(rcSIObj.getStatement(sessObj.getConnObj()));
sessObj.qsOpen = false;
sessObj.setDBConnExists(true);
+ boolean trafver = sessObj.getPlatformObjectVersions();
writer.writeln();
- writer.writeln("Connected to Trafodion ");
+ writer.writeln("Connected to " + sessObj.getDatabaseEdition());
rcPaObj.retryCnt = 0;
sessObj.setQryEndTime();
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/2e6e3545/core/conn/trafci/src/org/trafodion/ci/ParseArguments.java
----------------------------------------------------------------------
diff --git a/core/conn/trafci/src/org/trafodion/ci/ParseArguments.java b/core/conn/trafci/src/org/trafodion/ci/ParseArguments.java
index 732e81c..57944a0 100644
--- a/core/conn/trafci/src/org/trafodion/ci/ParseArguments.java
+++ b/core/conn/trafci/src/org/trafodion/ci/ParseArguments.java
@@ -119,9 +119,9 @@ public class ParseArguments
//Pre-parse args for special cases
if (argsList.contains("-version"))
{
- cwObj.print("Trafodion JDBC Type 4 Driver : ");
+ cwObj.print("JDBC Type 4 Driver Build ID : ");
cwObj.println(JDBCVproc.getVproc());
- cwObj.print(SessionDefaults.PROD_NAME + " : ");
+ cwObj.print("Command Interface Build ID : ");
org.trafodion.ci.Vproc.main(args) ;
cwObj.println("");
System.exit(0); //any other args included w/version are ignored
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/2e6e3545/core/conn/trafci/src/org/trafodion/ci/Session.java
----------------------------------------------------------------------
diff --git a/core/conn/trafci/src/org/trafodion/ci/Session.java b/core/conn/trafci/src/org/trafodion/ci/Session.java
index 5d570eb..5219679 100644
--- a/core/conn/trafci/src/org/trafodion/ci/Session.java
+++ b/core/conn/trafci/src/org/trafodion/ci/Session.java
@@ -95,6 +95,8 @@ public class Session extends RepObjInterface
private String processName=null;
private boolean patternsLoaded=false;
private String ndcsVersion = null;
+ private String databaseVersion = null;
+ private String databaseEdition = null;
public String serverType=null;
ValidateQuery vQryObj = null;
@@ -1841,34 +1843,19 @@ static {
if (rs!=null && rs.next()) {
{
ndcsVersion = rs.getString(2);
- /*
- * TODO . get platform version substring from ndcsVersion output:
- ndcs Version 1.0.0 Release 1.1.0 (Build release [15394], date 24Feb12)
- */
if (ndcsVersion != null){
- ndcsVersion = ndcsVersion.substring(ndcsVersion.indexOf("Version"));
- sutVersion = ndcsVersion.substring(ndcsVersion.indexOf("Release"),ndcsVersion.indexOf("("));
- String platformVersion = sutVersion.substring(8);
- if (platformVersion.startsWith("1.0"))
- versionInfo=SessionDefaults.VERSION_M5;
- else if (platformVersion.startsWith("1.1"))
- versionInfo=SessionDefaults.VERSION_M6;
- else if (platformVersion.startsWith("1.2"))
- versionInfo=SessionDefaults.VERSION_M7;
- else if (platformVersion.startsWith("1.3"))
- versionInfo=SessionDefaults.VERSION_M8;
- else if (platformVersion.startsWith("1.4"))
- versionInfo=SessionDefaults.VERSION_M9;
- else if (platformVersion.startsWith("1.5"))
- versionInfo=SessionDefaults.VERSION_M10;
- else if (platformVersion.startsWith("1.6"))
- versionInfo=SessionDefaults.VERSION_M11;
+ ndcsVersion = ndcsVersion.substring(ndcsVersion.indexOf("Version"));
+ sutVersion = ndcsVersion.substring(ndcsVersion.indexOf("Release"),ndcsVersion.indexOf("("));
+ String platformVersion = sutVersion.substring(8);
}
+ databaseVersion = rs.getString(5);
+ databaseEdition = rs.getString(6);
}
if (this.debugOn) {
System.out.println("ndcs version:: " + ndcsVersion);
- System.out.println("platform version:: " + sutVersion);
+ System.out.println("database version:: " + databaseVersion);
+ System.out.println("database edition:: " + databaseEdition);
}
rs.close();
stmt.close();
@@ -1909,5 +1896,13 @@ static {
public void setServerType(String serverType) {
this.serverType = serverType;
}
+
+ public String getDatabaseVersion() {
+ return databaseVersion;
+ }
+
+ public String getDatabaseEdition() {
+ return databaseEdition;
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/2e6e3545/core/conn/trafci/src/org/trafodion/ci/SessionDefaults.java
----------------------------------------------------------------------
diff --git a/core/conn/trafci/src/org/trafodion/ci/SessionDefaults.java b/core/conn/trafci/src/org/trafodion/ci/SessionDefaults.java
index f60e9e1..3639ce1 100644
--- a/core/conn/trafci/src/org/trafodion/ci/SessionDefaults.java
+++ b/core/conn/trafci/src/org/trafodion/ci/SessionDefaults.java
@@ -22,6 +22,7 @@
package org.trafodion.ci;
public interface SessionDefaults {
+ final String DATABASE_EDITION = System.getenv("TRAFODION_VER_PROD");
final String PROD_NAME = System.getenv("TRAFODION_VER_PROD")+" Command Interface ";
final String APP_NAME = "TrafCI";
final String DRIVER_NAME = "org.trafodion.jdbc.t4.T4Driver";
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/2e6e3545/core/conn/trafci/src/org/trafodion/ci/UserInterface.java
----------------------------------------------------------------------
diff --git a/core/conn/trafci/src/org/trafodion/ci/UserInterface.java b/core/conn/trafci/src/org/trafodion/ci/UserInterface.java
index a9a15c2..ce8ac7d 100644
--- a/core/conn/trafci/src/org/trafodion/ci/UserInterface.java
+++ b/core/conn/trafci/src/org/trafodion/ci/UserInterface.java
@@ -300,7 +300,7 @@ public class UserInterface {
if (paObj.noConnectOption)
System.out.println("Not connected.");
else
- System.out.println("Connected to Trafodion ");
+ System.out.println("Connected to " + sessObj.getDatabaseEdition());
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/2e6e3545/core/conn/trafci/utils/trafci
----------------------------------------------------------------------
diff --git a/core/conn/trafci/utils/trafci b/core/conn/trafci/utils/trafci
index 3a21379..8ba5152 100755
--- a/core/conn/trafci/utils/trafci
+++ b/core/conn/trafci/utils/trafci
@@ -20,6 +20,14 @@
#
# @@@ END COPYRIGHT @@@
+if [[ $# -gt 0 ]]; then
+ echo
+ echo "This wrapper script(trafci) does not accept any arguments."
+ echo "Please use trafci.sh for command line arguments"
+ echo
+ exit 1
+fi
+
HNAME=localhost:23400
UNAME=zz
PWORD=zz
[2/5] incubator-trafodion git commit: Merge branch 'master' of
github.com:apache/incubator-trafodion into wrkbrnch
Posted by db...@apache.org.
Merge branch 'master' of github.com:apache/incubator-trafodion into wrkbrnch
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/3a6a6155
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/3a6a6155
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/3a6a6155
Branch: refs/heads/master
Commit: 3a6a615582bf80050c69e9a573b75afb64077ca1
Parents: 9fa9b61 372ea0b
Author: Anuradha Hegde <an...@esgyn.com>
Authored: Fri May 6 19:02:02 2016 +0000
Committer: Anuradha Hegde <an...@esgyn.com>
Committed: Fri May 6 19:02:02 2016 +0000
----------------------------------------------------------------------
core/sql/generator/GenRelExeUtil.cpp | 2 +-
core/sql/regress/hive/DIFF018.KNOWN.SB | 10 +
core/sql/regress/hive/EXPECTED015 | 101 +-
core/sql/regress/hive/TEST015 | 14 +-
core/sql/regress/udr/EXPECTED001 | 18 +-
core/sql/regress/udr/TEST001 | 4 +-
core/sql/ustat/hs_globals.cpp | 1 +
docs/client_install/pom.xml | 10 +
.../src/asciidoc/_chapters/SQuirrel.adoc | 16 +-
.../src/asciidoc/_chapters/about.adoc | 16 +-
.../src/asciidoc/_chapters/dbviz.adoc | 12 +-
.../src/asciidoc/_chapters/introduction.adoc | 104 +-
.../src/asciidoc/_chapters/jdbct4.adoc | 32 +-
.../src/asciidoc/_chapters/odb.adoc | 8 +-
.../src/asciidoc/_chapters/odbc_linux.adoc | 18 +-
.../src/asciidoc/_chapters/odbc_windows.adoc | 54 +-
.../src/asciidoc/_chapters/trafci.adoc | 10 +-
docs/client_install/src/asciidoc/index.adoc | 28 +-
docs/command_interface/pom.xml | 8 +
.../src/asciidoc/_chapters/about.adoc | 22 +-
.../src/asciidoc/_chapters/commands.adoc | 40 +-
.../src/asciidoc/_chapters/install.adoc | 4 +-
.../src/asciidoc/_chapters/interactive.adoc | 14 +-
.../src/asciidoc/_chapters/introduction.adoc | 6 +-
.../src/asciidoc/_chapters/launch.adoc | 16 +-
.../src/asciidoc/_chapters/perlpython.adoc | 6 +-
.../src/asciidoc/_chapters/scripts.adoc | 4 +-
docs/command_interface/src/asciidoc/index.adoc | 29 +-
docs/cqd_reference/pom.xml | 8 +
.../src/asciidoc/_chapters/about.adoc | 23 +-
.../src/asciidoc/_chapters/debugging.adoc | 14 +-
.../src/asciidoc/_chapters/histograms.adoc | 16 +-
.../src/asciidoc/_chapters/introduction.adoc | 8 +-
.../_chapters/operational_controls.adoc | 26 +-
.../src/asciidoc/_chapters/query_execution.adoc | 46 +-
.../src/asciidoc/_chapters/query_plans.adoc | 78 +-
.../asciidoc/_chapters/runtime_controls.adoc | 6 +-
.../src/asciidoc/_chapters/schema_controls.adoc | 8 +-
.../asciidoc/_chapters/table_definition.adoc | 28 +-
.../src/asciidoc/_chapters/transactions.adoc | 6 +-
.../src/asciidoc/_chapters/update_stats.adoc | 14 +-
docs/cqd_reference/src/asciidoc/index.adoc | 21 +-
docs/jdbct4ref_guide/pom.xml | 297 +++
.../src/asciidoc/_chapters/about.adoc | 174 ++
.../src/asciidoc/_chapters/accessing.adoc | 906 ++++++++
.../asciidoc/_chapters/avoiding_mismatch.adoc | 97 +
.../src/asciidoc/_chapters/code_examples.adoc | 56 +
.../src/asciidoc/_chapters/compliance.adoc | 367 ++++
.../src/asciidoc/_chapters/introduction.adoc | 53 +
.../src/asciidoc/_chapters/lob_data.adoc | 553 +++++
.../src/asciidoc/_chapters/lob_management.adoc | 288 +++
.../src/asciidoc/_chapters/messages.adoc | 1943 ++++++++++++++++++
.../asciidoc/_chapters/properties_detail.adoc | 959 +++++++++
.../asciidoc/_chapters/properties_overview.adoc | 244 +++
.../src/asciidoc/_chapters/tracing_logging.adoc | 176 ++
docs/jdbct4ref_guide/src/asciidoc/index.adoc | 67 +
docs/jdbct4ref_guide/src/images/lob_tables.jpg | Bin 0 -> 16241 bytes
.../src/resources/source/blob_example.java | 202 ++
.../src/resources/source/clob_example.java | 200 ++
docs/load_transform/pom.xml | 8 +
.../src/asciidoc/_chapters/about.adoc | 31 +-
.../src/asciidoc/_chapters/bulk_load.adoc | 34 +-
.../src/asciidoc/_chapters/bulk_unload.adoc | 12 +-
.../src/asciidoc/_chapters/introduction.adoc | 24 +-
.../src/asciidoc/_chapters/monitor.adoc | 8 +-
.../src/asciidoc/_chapters/tables_indexes.adoc | 24 +-
.../src/asciidoc/_chapters/trickle_load.adoc | 54 +-
.../src/asciidoc/_chapters/troubleshoot.adoc | 20 +-
docs/load_transform/src/asciidoc/index.adoc | 22 +-
docs/messages_guide/pom.xml | 8 +
.../src/asciidoc/_chapters/about.adoc | 25 +-
.../src/asciidoc/_chapters/binder_msgs.adoc | 162 +-
.../src/asciidoc/_chapters/compiler_msgs.adoc | 164 +-
.../src/asciidoc/_chapters/ddl_msgs.adoc | 156 +-
.../src/asciidoc/_chapters/executor_msgs.adoc | 82 +-
.../asciidoc/_chapters/file_system_errors.adoc | 6 +-
.../src/asciidoc/_chapters/generator_msgs.adoc | 4 +-
.../src/asciidoc/_chapters/introduction.adoc | 34 +-
.../src/asciidoc/_chapters/optimizer_msgs.adoc | 6 +-
.../src/asciidoc/_chapters/parser_msgs.adoc | 74 +-
.../src/asciidoc/_chapters/sort_msgs.adoc | 68 +-
.../src/asciidoc/_chapters/sqlstate.adoc | 78 +-
.../_chapters/udr_language_mgr_msgs.adoc | 26 +-
docs/messages_guide/src/asciidoc/index.adoc | 21 +-
docs/odb_user/pom.xml | 8 +
.../src/asciidoc/_chapters/a_warnings.adoc | 4 +-
docs/odb_user/src/asciidoc/_chapters/about.adoc | 24 +-
.../src/asciidoc/_chapters/b_develop.adoc | 2 +-
.../src/asciidoc/_chapters/compare_tables.adoc | 2 +-
.../src/asciidoc/_chapters/concepts.adoc | 23 +-
.../src/asciidoc/_chapters/install.adoc | Bin 13598 -> 13248 bytes
.../src/asciidoc/_chapters/introduction.adoc | 36 +-
docs/odb_user/src/asciidoc/_chapters/load.adoc | 42 +-
.../src/asciidoc/_chapters/query_driver.adoc | 4 +-
.../src/asciidoc/_chapters/sql_interpreter.adoc | 4 +-
docs/odb_user/src/asciidoc/index.adoc | 21 +-
docs/provisioning_guide/pom.xml | 10 +
.../src/asciidoc/_chapters/about.adoc | 35 +-
.../src/asciidoc/_chapters/activate.adoc | 30 +-
.../src/asciidoc/_chapters/enable_security.adoc | 52 +-
.../src/asciidoc/_chapters/introduction.adoc | 184 +-
.../src/asciidoc/_chapters/prepare.adoc | 84 +-
.../src/asciidoc/_chapters/requirements.adoc | 125 +-
.../src/asciidoc/_chapters/script_install.adoc | 80 +-
.../src/asciidoc/_chapters/script_remove.adoc | 22 +-
.../src/asciidoc/_chapters/script_upgrade.adoc | 82 +-
docs/provisioning_guide/src/asciidoc/index.adoc | 22 +-
docs/shared/acknowledgements.txt | 60 +
docs/shared/revisions.txt | 32 +
.../spj_guide/src/asciidoc/_chapters/about.adoc | 2 +-
.../src/asciidoc/_chapters/create_spjs.adoc | 36 +-
.../src/asciidoc/_chapters/deploy_spjs.adoc | 34 +-
.../src/asciidoc/_chapters/develop_spjs.adoc | 36 +-
.../src/asciidoc/_chapters/execute_spjs.adoc | 34 +-
.../src/asciidoc/_chapters/get_started.adoc | 36 +-
.../asciidoc/_chapters/grant_privileges.adoc | 36 +-
.../src/asciidoc/_chapters/introduction.adoc | 36 +-
.../_chapters/performance_troubleshooting.adoc | 36 +-
.../src/asciidoc/_chapters/sample_database.adoc | 36 +-
.../src/asciidoc/_chapters/sample_spjs.adoc | 42 +-
docs/spj_guide/src/asciidoc/index.adoc | 14 +-
.../src/resources/acknowledgements.txt | 38 -
.../src/resources/source/create_demo.sql | 14 +
docs/sql_reference/pom.xml | 8 +
.../src/asciidoc/_chapters/about.adoc | 48 +-
.../src/asciidoc/_chapters/introduction.adoc | 112 +-
.../src/asciidoc/_chapters/limits.adoc | 4 +-
.../src/asciidoc/_chapters/olap_functions.adoc | 19 +-
.../src/asciidoc/_chapters/reserved_words.adoc | 13 +-
.../src/asciidoc/_chapters/runtime_stats.adoc | 13 +-
.../src/asciidoc/_chapters/sql_clauses.adoc | 26 +-
.../sql_functions_and_expressions.adoc | 304 +--
.../_chapters/sql_language_elements.adoc | 160 +-
.../src/asciidoc/_chapters/sql_statements.adoc | 374 ++--
.../src/asciidoc/_chapters/sql_utilities.adoc | 84 +-
docs/sql_reference/src/asciidoc/index.adoc | 27 +-
docs/src/site/resources/css/site.css | 2 +-
137 files changed, 8897 insertions(+), 2357 deletions(-)
----------------------------------------------------------------------
[3/5] incubator-trafodion git commit: Merge branch 'master' of
github.com:apache/incubator-trafodion into wrkbrnch
Posted by db...@apache.org.
Merge branch 'master' of github.com:apache/incubator-trafodion into wrkbrnch
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/e4791e72
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/e4791e72
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/e4791e72
Branch: refs/heads/master
Commit: e4791e72b47b1ac15af223c4832064155db009b0
Parents: 3a6a615 1407692
Author: Anuradha Hegde <an...@esgyn.com>
Authored: Mon May 9 16:57:42 2016 +0000
Committer: Anuradha Hegde <an...@esgyn.com>
Committed: Mon May 9 16:57:42 2016 +0000
----------------------------------------------------------------------
core/sql/executor/ExHdfsScan.h | 1 +
core/sql/exp/ExpPCodeClauseGen.cpp | 1 +
core/sql/exp/exp_clause.cpp | 6 +-
core/sql/exp/exp_clause_derived.h | 9 ++-
core/sql/exp/exp_conv.cpp | 13 +++-
core/sql/generator/GenItemFunc.cpp | 16 ++++-
core/sql/generator/GenRelScan.cpp | 14 +++-
core/sql/optimizer/ItemExpr.cpp | 2 +
core/sql/optimizer/ItemFunc.h | 8 +++
core/sql/regress/hive/EXPECTED005 | 97 +++++++++++++++++++++++++++
core/sql/regress/hive/TEST005 | 40 +++++++++++
core/sql/regress/hive/TEST005_a.hive.sql | 16 +++++
core/sql/regress/hive/tbl_bad.data | 8 +++
13 files changed, 221 insertions(+), 10 deletions(-)
----------------------------------------------------------------------