You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by an...@apache.org on 2016/09/25 01:57:44 UTC
[07/14] incubator-trafodion git commit: Merge branch 'master' of
github.com:apache/incubator-trafodion into sean_traf
Merge branch 'master' of github.com:apache/incubator-trafodion into sean_traf
Conflicts:
core/sql/src/main/java/org/trafodion/sql/HTableClient.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/508b8cfd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/508b8cfd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/508b8cfd
Branch: refs/heads/master
Commit: 508b8cfdbc1d6b1272ee19ebc0e2372daa702f95
Parents: 33b235a b07378d
Author: Sean Broeder <sb...@edev06.esgyn.local>
Authored: Thu Sep 22 02:51:30 2016 +0000
Committer: Sean Broeder <sb...@edev06.esgyn.local>
Committed: Thu Sep 22 02:51:30 2016 +0000
----------------------------------------------------------------------
core/conn/odbc/src/odbc/nsksrvrcore/Makefile | 2 +-
core/dbsecurity/auth/Makefile | 24 +-
core/dbsecurity/auth/depend.mk | 8 +-
core/dbsecurity/auth/inc/authEvents.h | 107 ++
core/dbsecurity/auth/inc/dbUserAuth.h | 2 +
core/dbsecurity/auth/inc/ld_globals.h | 48 -
core/dbsecurity/auth/inc/ldapconfignode.h | 46 +-
core/dbsecurity/auth/src/authEvents.cpp | 176 +++
core/dbsecurity/auth/src/dbUserAuth.cpp | 319 ++--
core/dbsecurity/auth/src/ld_port.cpp | 201 ---
core/dbsecurity/auth/src/ldapcheck.cpp | 465 +++---
core/dbsecurity/auth/src/ldapconfignode.cpp | 403 +++---
core/dbsecurity/macros.gmk | 8 +-
core/sqf/conf/log4cxx.trafodion.auth.config | 49 +
.../export/include/common/evl_sqlog_eventnum.h | 3 +-
core/sql/comexe/ComTdbHbaseAccess.h | 7 +-
core/sql/executor/ExExeUtilExplain.cpp | 19 +
core/sql/executor/ExHbaseIUD.cpp | 19 +-
core/sql/executor/HBaseClient_JNI.cpp | 68 +-
core/sql/executor/HBaseClient_JNI.h | 32 +-
core/sql/exp/ExpHbaseInterface.cpp | 81 +-
core/sql/exp/ExpHbaseInterface.h | 59 +-
core/sql/generator/GenExplain.cpp | 8 +
core/sql/generator/GenPreCode.cpp | 99 +-
core/sql/generator/GenRelUpdate.cpp | 49 +-
core/sql/optimizer/BindRelExpr.cpp | 11 +-
core/sql/optimizer/RelUpdate.h | 6 +
core/sql/regress/charsets/EXPECTED003 | 3 +-
core/sql/regress/charsets/EXPECTED012 | 4 +-
core/sql/regress/compGeneral/EXPECTED013.SB | 11 +-
core/sql/regress/compGeneral/EXPECTED071 | 4 +
core/sql/regress/compGeneral/TEST071 | 2 +
core/sql/regress/core/EXPECTED029.SB | 105 +-
core/sql/regress/core/EXPECTED056.SB | 9 +
core/sql/regress/core/EXPECTED061.SB | 8 +-
core/sql/regress/core/EXPECTED116 | 628 +++++++-
core/sql/regress/core/EXPECTEDRTS | 1362 +++++++++---------
core/sql/regress/core/TEST116 | 198 +++
core/sql/regress/executor/EXPECTED013.SB | 56 +-
core/sql/regress/executor/EXPECTED014.SB | 22 +-
core/sql/regress/executor/EXPECTED016.SB | 14 +-
core/sql/regress/executor/EXPECTED122 | 9 +-
core/sql/regress/executor/EXPECTED131 | 24 +-
core/sql/regress/executor/EXPECTED140 | 74 +-
core/sql/regress/executor/TEST140 | 2 +
core/sql/regress/hive/DIFF003.KNOWN | 10 +
core/sql/regress/qat/eqatddl01 | 3 +
core/sql/regress/qat/qatddl01 | 1 +
core/sql/regress/seabase/EXPECTED010 | 611 ++++----
core/sql/regress/seabase/EXPECTED011 | 22 +-
core/sql/regress/seabase/EXPECTED012 | 5 +-
core/sql/regress/seabase/EXPECTED016 | 56 +-
core/sql/regress/seabase/EXPECTED020 | 56 +-
core/sql/regress/seabase/EXPECTED025 | 36 +-
core/sql/regress/seabase/EXPECTED027 | 85 +-
core/sql/regress/seabase/EXPECTED031 | 23 +-
core/sql/regress/seabase/EXPECTED032 | 41 +-
core/sql/regress/seabase/EXPECTED040 | 11 +
core/sql/regress/seabase/TEST010 | 2 +
core/sql/regress/seabase/TEST011 | 1 +
core/sql/regress/seabase/TEST027 | 1 +
core/sql/regress/seabase/TEST032 | 4 +
core/sql/regress/tools/sbdefs | 2 +-
core/sql/sqlcomp/CmpSeabaseDDLmd.h | 24 +
core/sql/sqlcomp/CmpSeabaseDDLrepos.h | 6 +-
core/sql/sqlcomp/DefaultConstants.h | 4 +
core/sql/sqlcomp/PrivMgrMDDefs.h | 32 +-
core/sql/sqlcomp/nadefaults.cpp | 2 +
.../java/org/trafodion/sql/HBaseClient.java | 42 +-
.../java/org/trafodion/sql/HTableClient.java | 279 ++--
70 files changed, 3750 insertions(+), 2463 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/508b8cfd/core/sql/src/main/java/org/trafodion/sql/HTableClient.java
----------------------------------------------------------------------
diff --cc core/sql/src/main/java/org/trafodion/sql/HTableClient.java
index 4c99290,fce661a..30cf770
--- a/core/sql/src/main/java/org/trafodion/sql/HTableClient.java
+++ b/core/sql/src/main/java/org/trafodion/sql/HTableClient.java
@@@ -1364,53 -1362,57 +1362,54 @@@ public class HTableClient
public boolean deleteRow(final long transID, byte[] rowID,
Object[] columns,
long timestamp,
- boolean asyncOperation) throws IOException {
+ boolean asyncOperation,
+ boolean useRegionXn) throws IOException {
- if (logger.isTraceEnabled()) logger.trace("Enter deleteRow(" + new String(rowID) + ", "
- + timestamp + ") " + tableName);
-
- final Delete del;
- if (timestamp == -1)
- del = new Delete(rowID);
- else
- del = new Delete(rowID, timestamp);
-
- if (columns != null) {
- for (int i = 0; i < columns.length ; i++) {
- byte[] col = (byte[]) columns[i];
- del.deleteColumns(getFamily(col), getName(col));
- }
- }
- if (asyncOperation) {
- future = executorService.submit(new Callable() {
- public Object call() throws IOException {
- boolean res = true;
- if (useTRex && (transID != 0)) {
- table.delete(transID, del);
- }
- else if (useRegionTransaction){
- table.deleteRegionTx(del, /* auto-commit */ true);
- }
- else {
- table.delete(del);
- }
- return true;
- }
- });
- }
- else {
- if (useTRex && (transID != 0)) {
- table.delete(transID, del);
+ if (logger.isTraceEnabled()) logger.trace("Enter deleteRow(" + new String(rowID) + ", "
+ + timestamp + ") " + tableName);
+
+ final Delete del;
+ if (timestamp == -1)
+ del = new Delete(rowID);
+ else
+ del = new Delete(rowID, timestamp);
+
+ if (columns != null) {
+ for (int i = 0; i < columns.length ; i++) {
+ byte[] col = (byte[]) columns[i];
+ del.deleteColumns(getFamily(col), getName(col));
+ }
}
- else if (useRegionTransaction){
- table.deleteRegionTx(del, /* auto-commit */ true);
+ if (asyncOperation) {
+ future = executorService.submit(new Callable() {
+ public Object call() throws IOException {
+ boolean res = true;
+ if (useTRex && (transID != 0)) {
+ table.delete(transID, del);
+ }
- // else if (useRegionXn){
- // logger.info("deleteRow using region TX");
- // table.deleteRegionTx(del, /* auto-commit */ true);
- // }
++ else if (useRegionXn){
++ table.deleteRegionTx(del, /* auto-commit */ true);
++ }
+ else {
- // logger.info("deleteRow without transID ");
+ table.delete(del);
+ }
+ return true;
+ }
+ });
}
else {
- table.delete(del);
+ if (useTRex && (transID != 0)) {
+ table.delete(transID, del);
+ }
- // else if (useRegionXn){
- // logger.info("deleteRow using region TX");
- // table.deleteRegionTx(del, /* auto-commit */ true);
- // }
++ else if (useRegionXn){
++ table.deleteRegionTx(del, /* auto-commit */ true);
++ }
+ else {
+ table.delete(del);
+ }
}
- }
- if (logger.isTraceEnabled()) logger.trace("Exit deleteRow");
- return true;
+ if (logger.isTraceEnabled()) logger.trace("Exit deleteRow");
+ return true;
}
public boolean deleteRows(final long transID, short rowIDLen, Object rowIDs,
@@@ -1476,45 -1478,47 +1475,46 @@@
public boolean checkAndDeleteRow(long transID, byte[] rowID,
byte[] columnToCheck, byte[] colValToCheck,
- long timestamp) throws IOException {
-
- if (logger.isTraceEnabled()) logger.trace("Enter checkAndDeleteRow(" + new String(rowID) + ", "
- + new String(columnToCheck) + ", " + new String(colValToCheck) + ", " + timestamp + ") " + tableName);
+ long timestamp, boolean useRegionXn) throws IOException {
- Delete del;
- if (timestamp == -1)
- del = new Delete(rowID);
- else
- del = new Delete(rowID, timestamp);
-
- byte[] family = null;
- byte[] qualifier = null;
-
- if (columnToCheck.length > 0) {
- family = getFamily(columnToCheck);
- qualifier = getName(columnToCheck);
- }
-
- boolean res;
- if (useTRex && (transID != 0)) {
- res = table.checkAndDelete(transID, rowID, family, qualifier, colValToCheck, del);
+ if (logger.isTraceEnabled()) logger.trace("Enter checkAndDeleteRow(" + new String(rowID) + ", "
+ + new String(columnToCheck) + ", " + new String(colValToCheck) + ", " + timestamp + ") " + tableName);
+
+ Delete del;
+ if (timestamp == -1)
+ del = new Delete(rowID);
+ else
+ del = new Delete(rowID, timestamp);
+
+ byte[] family = null;
+ byte[] qualifier = null;
+
+ if (columnToCheck.length > 0) {
+ family = getFamily(columnToCheck);
+ qualifier = getName(columnToCheck);
}
- else if (useRegionTransaction){
+
+ boolean res;
+ if (useTRex && (transID != 0)) {
+ res = table.checkAndDelete(transID, rowID, family, qualifier, colValToCheck, del);
+ }
- // else if (useRegionXn){
- // logger.info("checkAndDeleteRow using region TX");
- // res = table.checkAndDeleteRegionTx(rowID, family, qualifier, colValToCheck,
- // del, /* autoCommit */ true);
- // }
++ else if (useRegionXn){
+ res = table.checkAndDeleteRegionTx(rowID, family, qualifier, colValToCheck,
+ del, /* autoCommit */ true);
+ }
else {
- res = table.checkAndDelete(rowID, family, qualifier, colValToCheck, del);
+ res = table.checkAndDelete(rowID, family, qualifier, colValToCheck, del);
}
-
- if (res == false)
- return false;
- return true;
+
+ if (res == false)
+ return false;
+ return true;
}
-
+
public boolean putRow(final long transID, final byte[] rowID, Object row,
- byte[] columnToCheck, final byte[] colValToCheck,
- final boolean checkAndPut, boolean asyncOperation) throws IOException, InterruptedException,
+ byte[] columnToCheck, final byte[] colValToCheck,
+ final boolean checkAndPut, boolean asyncOperation,
+ final boolean useRegionXn) throws IOException, InterruptedException,
ExecutionException
{
if (logger.isTraceEnabled()) logger.trace("Enter putRow() " + tableName);