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:39 UTC
[4/5] incubator-trafodion git commit: version command now displays
information from the server
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