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/06/13 19:17:41 UTC

[1/5] incubator-trafodion git commit: Merge branch 'master' of github.com:apache/incubator-trafodion into sean_traf

Repository: incubator-trafodion
Updated Branches:
  refs/heads/master b4ab0185e -> d0c0e86c4


Merge branch 'master' of github.com:apache/incubator-trafodion into sean_traf


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

Branch: refs/heads/master
Commit: 8007949c8043aad25d3613f13153c488d61f6926
Parents: 9715668 0fed958
Author: Sean Broeder <sb...@edev06.esgyn.local>
Authored: Mon May 16 16:36:57 2016 +0000
Committer: Sean Broeder <sb...@edev06.esgyn.local>
Committed: Mon May 16 16:36:57 2016 +0000

----------------------------------------------------------------------
 core/sql/bin/SqlciErrors.txt            |   1 +
 core/sql/executor/ExHbaseIUD.cpp        |   3 +-
 core/sql/executor/HBaseClient_JNI.cpp   | 223 +--------------------------
 core/sql/executor/HBaseClient_JNI.h     |  70 +--------
 core/sql/exp/ExpLOB.cpp                 |  10 ++
 core/sql/generator/GenPreCode.cpp       |  14 +-
 core/sql/regress/executor/EXPECTED130   |  77 +++++----
 core/sql/regress/executor/TEST130       |   6 +-
 core/sql/sqlcomp/CmpSeabaseDDLtable.cpp |   3 +-
 9 files changed, 80 insertions(+), 327 deletions(-)
----------------------------------------------------------------------



[4/5] incubator-trafodion git commit: Fix for JIRA [TRAFODION-1996] TLOG uses excessive memory when aging old entries

Posted by db...@apache.org.
Fix for JIRA [TRAFODION-1996]
TLOG uses excessive memory when aging old entries


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

Branch: refs/heads/master
Commit: 6b5da39b1a2b4359735439ff7095ba719b11786e
Parents: 68653b1
Author: Sean Broeder <sb...@edev06.esgyn.local>
Authored: Thu Jun 9 13:59:37 2016 +0000
Committer: Sean Broeder <sb...@edev06.esgyn.local>
Committed: Thu Jun 9 13:59:37 2016 +0000

----------------------------------------------------------------------
 .../transactional/TrxRegionEndpoint.java.tmpl   |  35 ++++---
 .../trafodion/dtm/HBaseAuditControlPoint.java   |   4 +-
 .../java/org/trafodion/dtm/TmAuditTlog.java     | 101 +++++++++----------
 3 files changed, 71 insertions(+), 69 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6b5da39b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxRegionEndpoint.java.tmpl
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxRegionEndpoint.java.tmpl b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxRegionEndpoint.java.tmpl
index b0e87d3..69ddb68 100644
--- a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxRegionEndpoint.java.tmpl
+++ b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxRegionEndpoint.java.tmpl
@@ -2184,7 +2184,7 @@ CoprocessorService, Coprocessor {
      }
      catch (Exception e){
         if (LOG.isTraceEnabled()) LOG.trace("deleteTlogEntries Exception in region: "
-           + regionInfo.getRegionNameAsString() + " getting scanner " + e );
+           + regionInfo.getRegionNameAsString() + " getting scanner ", e );
      }
 
      long count = 0L;
@@ -2224,11 +2224,13 @@ CoprocessorService, Coprocessor {
                        StringTokenizer st = new StringTokenizer(valueString, ",");
                        if (st.hasMoreElements()) {
                           String asnToken = st.nextElement().toString();
-                          String transidToken = st.nextElement().toString();
-                          String stateToken = st.nextElement().toString();
-                          if (LOG.isTraceEnabled()) LOG.trace("TrxRegionEndpoint coprocessor: deleteTlogEntries transidToken: "
-                                    + transidToken + " asnToken: " + asnToken);
+                          String transidToken = null;
+                          String stateToken = null;
                           if (Long.parseLong(asnToken) < lvAsn) {
+                             transidToken = st.nextElement().toString();
+                             stateToken = st.nextElement().toString();
+                             if (LOG.isTraceEnabled()) LOG.trace("TrxRegionEndpoint coprocessor: deleteTlogEntries transidToken: "
+                                    + transidToken + " asnToken: " + asnToken);
                              if ( (stateToken.contains("FORGOTTEN")) ||
                                   (stateToken.equals("COMMITTED") && (lvAgeCommitted)) ||
                                   (stateToken.equals("ABORTED") && (lvAgeCommitted))) {
@@ -2238,11 +2240,12 @@ CoprocessorService, Coprocessor {
 
                                 try {
                                    Delete d = new Delete(result.getRow());
+                                   d.setDurability(Durability.SKIP_WAL);
                                    m_Region.delete(d);
                                 }
                                 catch (Exception e) {
                                    LOG.warn("TrxRegionEndpoint coprocessor: deleteTlogEntries -"
-                                       + " txId " + transidToken + ", Executing delete caught an exception " + e);
+                                       + " txId " + transidToken + ", Executing delete caught an exception ", e);
                                    throw new IOException(e.toString());
                                 }
                                 count++;
@@ -2288,15 +2291,17 @@ CoprocessorService, Coprocessor {
                     + e.getMessage() + " " + stackTraceToString(e));
            t = e;
         }
-        if (scanner != null) {
-           try {
-              if (LOG.isTraceEnabled()) LOG.trace("TrxRegionEndpoint coprocessor: deleteTlogEntries - txId "
-                  + transId + ", closing the scanner, region is " + regionInfo.getRegionNameAsString());
-              scanner.close();
-           } catch(Exception e) {
-              if (LOG.isTraceEnabled()) LOG.trace("TrxRegionEndpoint coprocessor: deleteTlogEntries -  transaction id "
-                   + transId + ", Caught general exception " + e.getMessage() + " " + stackTraceToString(e));
-              ne = e;
+        finally {
+           if (scanner != null) {
+              try {
+                 if (LOG.isTraceEnabled()) LOG.trace("TrxRegionEndpoint coprocessor: deleteTlogEntries - txId "
+                     + transId + ", closing the scanner, region is " + regionInfo.getRegionNameAsString());
+                 scanner.close();
+              } catch(Exception e) {
+                 if (LOG.isTraceEnabled()) LOG.trace("TrxRegionEndpoint coprocessor: deleteTlogEntries -  transaction id "
+                      + transId + ", Caught general exception " + e.getMessage() + " " + stackTraceToString(e));
+                 ne = e;
+              }
            }
         }
      }

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6b5da39b/core/sqf/src/seatrans/tm/hbasetmlib2/src/main/java/org/trafodion/dtm/HBaseAuditControlPoint.java
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/tm/hbasetmlib2/src/main/java/org/trafodion/dtm/HBaseAuditControlPoint.java b/core/sqf/src/seatrans/tm/hbasetmlib2/src/main/java/org/trafodion/dtm/HBaseAuditControlPoint.java
index 11120ef..e50fe3b 100644
--- a/core/sqf/src/seatrans/tm/hbasetmlib2/src/main/java/org/trafodion/dtm/HBaseAuditControlPoint.java
+++ b/core/sqf/src/seatrans/tm/hbasetmlib2/src/main/java/org/trafodion/dtm/HBaseAuditControlPoint.java
@@ -34,6 +34,8 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hbase.Cell;
+import org.apache.hadoop.hbase.CellUtil;
 import org.apache.hadoop.hbase.client.HBaseAdmin;
 import org.apache.hadoop.hbase.client.HConnection;
 import org.apache.hadoop.hbase.client.HConnectionManager;
@@ -404,7 +406,7 @@ public class HBaseAuditControlPoint {
          table.delete(deleteList);
       }
       catch (Exception e) {
-         LOG.error("deleteAgedRecords IOException");
+         LOG.error("deleteAgedRecords IOException ", e);
       }finally {
          ss.close();
       }

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6b5da39b/core/sqf/src/seatrans/tm/hbasetmlib2/src/main/java/org/trafodion/dtm/TmAuditTlog.java
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/tm/hbasetmlib2/src/main/java/org/trafodion/dtm/TmAuditTlog.java b/core/sqf/src/seatrans/tm/hbasetmlib2/src/main/java/org/trafodion/dtm/TmAuditTlog.java
index a94aa16..11b17ce 100644
--- a/core/sqf/src/seatrans/tm/hbasetmlib2/src/main/java/org/trafodion/dtm/TmAuditTlog.java
+++ b/core/sqf/src/seatrans/tm/hbasetmlib2/src/main/java/org/trafodion/dtm/TmAuditTlog.java
@@ -194,7 +194,7 @@ public class TmAuditTlog {
         try {
            table = new HTable(location.getRegionInfo().getTable(), connection, tlogThreadPool);
         } catch(IOException e) {
-           LOG.error("Error obtaining HTable instance " + e);
+           LOG.error("Error obtaining HTable instance ", e);
            table = null;
         }
         startKey = location.getRegionInfo().getStartKey();
@@ -242,8 +242,9 @@ public class TmAuditTlog {
                          + " startKey: " + new String(startKey, "UTF-8") + " endKey: " + new String(endKey, "UTF-8"));
                    result = table.coprocessorService(TrxRegionService.class, startKey, endKey, callable);
                  } catch (Throwable e) {
-                   String msg = "ERROR occurred while calling deleteTlogEntries coprocessor service in deleteEntriesOlderThanASNX";
-                   LOG.error(msg + ":" + e);
+                   e.printStackTrace();
+                   String msg = new String("ERROR occurred while calling deleteTlogEntries coprocessor service in deleteEntriesOlderThanASNX: " + e);
+                   LOG.error(msg);
                    throw new Exception(msg);
                  }
                  if (LOG.isTraceEnabled()) LOG.trace("deleteEntriesOlderThanASNX -- after coprocessorService ASN: " + auditSeqNum
@@ -267,7 +268,7 @@ public class TmAuditTlog {
                     retry = false;
                  }
               } catch (Exception e) {
-                 LOG.error("deleteEntriesOlderThanASNX retrying due to Exception: " + e);
+                 LOG.error("deleteEntriesOlderThanASNX retrying due to Exception: ", e);
                  refresh = true;
                  retry = true;
               }
@@ -309,7 +310,7 @@ public class TmAuditTlog {
 
                retrySleep += TLOG_SLEEP_INCR;
             }
-         } while (retryCount < RETRY_ATTEMPTS && retry == true);
+       } while (retryCount < RETRY_ATTEMPTS && retry == true);
        // We have received our reply so decrement outstanding count
        transactionState.requestPendingCountDec(false);
 
@@ -334,7 +335,7 @@ public class TmAuditTlog {
             buffer.add(localPut);
          }
          catch (Exception e) {
-            if (LOG.isDebugEnabled()) LOG.debug("AuditBuffer Exception trying bufferAdd" + e);
+            if (LOG.isDebugEnabled()) LOG.debug("AuditBuffer Exception trying bufferAdd", e);
             throw e;
          }
          if (LOG.isTraceEnabled()) LOG.trace("BufferAdd end in thread " + threadId );
@@ -348,7 +349,7 @@ public class TmAuditTlog {
             lvSize = buffer.size();
          }
          catch (Exception e) {
-            if (LOG.isDebugEnabled()) LOG.debug("AuditBuffer Exception trying bufferSize" + e);
+            if (LOG.isDebugEnabled()) LOG.debug("AuditBuffer Exception trying bufferSize", e);
             throw e;
          }
          if (LOG.isTraceEnabled()) LOG.trace("AuditBuffer bufferSize end; returning " + lvSize + " in thread " 
@@ -363,7 +364,7 @@ public class TmAuditTlog {
             buffer.clear();
          }
          catch (Exception e) {
-            if (LOG.isDebugEnabled()) LOG.debug("Exception trying bufferClear.clear" + e);
+            if (LOG.isDebugEnabled()) LOG.debug("Exception trying bufferClear.clear", e);
             throw e;
          }
          if (LOG.isTraceEnabled()) LOG.trace("AuditBuffer bufferClear end in thread " + threadId);
@@ -522,7 +523,7 @@ public class TmAuditTlog {
           tLogHashShiftFactor = 59;
           break;
         default : {
-          LOG.error("TM_TLOG_NUM_LOGS must b 1 or a power of 2 in the range 2-32");
+          LOG.error("TM_TLOG_NUM_LOGS must be 1 or a power of 2 in the range 2-32");
           throw new RuntimeException();
         }
       }
@@ -571,7 +572,7 @@ public class TmAuditTlog {
          tLogControlPoint = new HBaseAuditControlPoint(config);
       }
       catch (Exception e) {
-         LOG.error("Unable to create new HBaseAuditControlPoint object " + e);
+         LOG.error("Unable to create new HBaseAuditControlPoint object ", e);
       }
 
       tlogAuditLock =    new Object[tlogNumLogs];
@@ -615,7 +616,7 @@ public class TmAuditTlog {
             table[i] = new HTable(config, desc.getName());
          }
          catch(Exception e){
-            LOG.error("TmAuditTlog Exception on index " + i + "; " + e);
+            LOG.error("TmAuditTlog Exception on index " + i + "; ", e);
             throw new RuntimeException(e);
          }
 
@@ -718,7 +719,7 @@ public class TmAuditTlog {
          }
          catch (Exception e2){
             // create record of the exception
-            LOG.error("putSingleRecord Exception in recoveryTable" + e2);
+            LOG.error("putSingleRecord Exception in recoveryTable", e2);
             throw e2;
          }
          finally {
@@ -733,7 +734,7 @@ public class TmAuditTlog {
          }
       }
       else {
-         // THis goes to our local TLOG
+         // This goes to our local TLOG
          if (LOG.isTraceEnabled()) LOG.trace("TLOG putSingleRecord synchronizing tlogAuditLock[" + lv_lockIndex + "] in thread " + threadId );
          startSynch = System.nanoTime();
          try {
@@ -751,7 +752,7 @@ public class TmAuditTlog {
                }
                catch (Exception e2){
                   // create record of the exception
-                  LOG.error("putSingleRecord Exception " + e2);
+                  LOG.error("putSingleRecord Exception ", e2);
                   e2.printStackTrace();
                   throw e2;
                }
@@ -759,7 +760,7 @@ public class TmAuditTlog {
          }
          catch (Exception e) {
             // create record of the exception
-            LOG.error("Synchronizing on tlogAuditLock[" + lv_lockIndex + "] Exception " + e);
+            LOG.error("Synchronizing on tlogAuditLock[" + lv_lockIndex + "] Exception ", e);
             e.printStackTrace();
             throw e;
          }
@@ -907,16 +908,16 @@ public class TmAuditTlog {
             if (LOG.isTraceEnabled()) LOG.trace("transid: " + lvTransid + " state: " + lvTxState);
          }
          catch (IOException e){
-             LOG.error("getRecord IOException " + e);
+             LOG.error("getRecord IOException ", e);
              throw e;
          }
          catch (Exception e){
-             LOG.error("getRecord Exception " + e);
+             LOG.error("getRecord Exception ", e);
              throw e;
          }
       }
       catch (Exception e2) {
-            LOG.error("getRecord Exception2 " + e2);
+            LOG.error("getRecord Exception2 ", e2);
             e2.printStackTrace();
       }
 
@@ -944,11 +945,11 @@ public class TmAuditTlog {
             lvTxState = st.nextElement().toString();
             if (LOG.isTraceEnabled()) LOG.trace("transid: " + transidToken + " state: " + lvTxState);
          } catch (IOException e){
-             LOG.error("getRecord IOException");
+             LOG.error("getRecord IOException: ", e);
              throw e;
          }
       } catch (Exception e){
-             LOG.error("getRecord Exception " + e);
+             LOG.error("getRecord Exception: ", e);
              throw e;
       }
       if (LOG.isTraceEnabled()) LOG.trace("getRecord end; returning String:" + lvTxState);
@@ -970,7 +971,7 @@ public class TmAuditTlog {
          table[lv_lockIndex].delete(d);
       }
       catch (Exception e) {
-         LOG.error("deleteRecord Exception " + e );
+         LOG.error("deleteRecord Exception: ", e );
       }
       if (LOG.isTraceEnabled()) LOG.trace("deleteRecord - exit");
       return true;
@@ -1051,7 +1052,7 @@ public class TmAuditTlog {
               }
            }
            catch(Exception e){
-              LOG.error("deleteAgedEntries Exception getting results for table " + lv_tLogName + "; " + e);
+              LOG.error("deleteAgedEntries Exception getting results for table " + lv_tLogName + "; ", e);
               throw new RuntimeException(e);
            }
            finally {
@@ -1064,13 +1065,13 @@ public class TmAuditTlog {
               deleteTable.delete(deleteList);
            }
            catch(IOException e){
-              LOG.error("deleteAgedEntries Exception deleting from table " + lv_tLogName + "; " + e);
+              LOG.error("deleteAgedEntries Exception deleting from table " + lv_tLogName + "; ", e);
               throw new RuntimeException(e);
            }
         }
         catch (IOException e) {
            LOG.error("deleteAgedEntries IOException setting up scan on table "
-                   + lv_tLogName + ", Exception: " + e);
+                   + lv_tLogName + ", Exception: ", e);
            e.printStackTrace();
         }
         finally {
@@ -1105,16 +1106,11 @@ public class TmAuditTlog {
             if (value.getStatus().equals("COMMITTED")){
                if (LOG.isTraceEnabled()) LOG.trace("writeControlPointRecords adding record for trans (" + transid + ") : state is " + value.getStatus());
                cpWrites++;
-               if (forceControlPoint) {
-                  putSingleRecord(transid, value.getCommitId(), value.getStatus(), value.getParticipatingRegions(), true);
-               }
-               else {
-                  putSingleRecord(transid, value.getCommitId(), value.getStatus(), value.getParticipatingRegions(), false);
-               }
+               putSingleRecord(transid, value.getCommitId(), value.getStatus(), value.getParticipatingRegions(), forceControlPoint);
             }
          }
          catch (Exception ex) {
-            LOG.error("formatRecord Exception " + ex);
+            LOG.error("formatRecord Exception ", ex);
             throw ex;
          }
         }
@@ -1177,7 +1173,7 @@ public class TmAuditTlog {
                      deleteEntriesOlderThanASN(agedAsn, ageCommitted);
                   }
                   catch (Exception e){
-                     LOG.error("deleteAgedEntries Exception " + e);
+                     LOG.error("deleteAgedEntries Exception ", e);
                      throw e;
                   }
                }
@@ -1189,12 +1185,12 @@ public class TmAuditTlog {
                }
             }
             catch (IOException e){
-               LOG.error("addControlPoint IOException " + e);
+               LOG.error("addControlPoint IOException ", e);
                throw e;
             }
          }
       } catch (Exception e){
-          LOG.error("addControlPoint Exception " + e);
+          LOG.error("addControlPoint Exception ", e);
           throw e;
       }
       if (LOG.isTraceEnabled()) LOG.trace("addControlPoint returning " + lvCtrlPt);
@@ -1371,7 +1367,7 @@ public class TmAuditTlog {
          }
       }
       catch (Exception e2) {
-            LOG.error("getTransactionState Exception2 " + e2);
+            LOG.error("getTransactionState Exception2 ", e2);
             e2.printStackTrace();
       }
       if (LOG.isTraceEnabled()) LOG.trace("getTransactionState end transid: " + ts.getTransactionId());
@@ -1389,7 +1385,7 @@ public class TmAuditTlog {
    * Purpose : Delete transaction records which are no longer needed
    */
    public void deleteEntriesOlderThanASN(final long pv_ASN, final boolean pv_ageCommitted) throws IOException {
-      int loopCount = 0;
+      int loopIndex = 0;
       long threadId = Thread.currentThread().getId();
       // This TransactionState object is just a mechanism to keep track of the asynch rpc calls
       // send to regions in order to retrience the desired set of transactions
@@ -1406,9 +1402,11 @@ public class TmAuditTlog {
          for (int index = 0; index < tlogNumLogs; index++) {
             String lv_tLogName = new String("TRAFODION._DTM_.TLOG" + String.valueOf(this.dtmid) + "_LOG_" + Integer.toHexString(index));
             regionList = connection.locateRegions(TableName.valueOf(lv_tLogName), false, false);
-            loopCount++;
+            loopIndex++;
+            int regionIndex = 0;
             // For every region in this table
             for (HRegionLocation location : regionList) {
+               regionIndex++;
                final byte[] regionName = location.getRegionInfo().getRegionName();
                compPool.submit(new TlogCallable(transactionState, location, connection) {
                   public Integer call() throws IOException {
@@ -1417,28 +1415,25 @@ public class TmAuditTlog {
                      return deleteEntriesOlderThanASNX(regionName, pv_ASN, pv_ageCommitted);
                   }
                });
+               
+               try {
+                   int partialResult = compPool.take().get();
+                   if (LOG.isTraceEnabled()) LOG.trace("deleteEntriesOlderThanASN partial result: " + partialResult
+                		      + " loopIndex " + loopIndex + " regionIndex " + regionIndex);
+                }
+                catch (Exception e2) {
+                   LOG.error("exception retieving reply in deleteEntriesOlderThanASN for interval ASN: " + pv_ASN
+                           + " ", e2);
+                   throw new IOException(e2);
+                }
             }
          }
       } catch (Exception e) {
          LOG.error("exception in deleteEntriesOlderThanASN for ASN: "
-                 + pv_ASN + " " + e);
+                 + pv_ASN + " ", e);
          throw new IOException(e);
       }
-      // all requests sent at this point, can record the count
-      if (LOG.isTraceEnabled()) LOG.trace("deleteEntriesOlderThanASN tlog callable requests sent to "
-                + loopCount + " tlogs in thread " + threadId);
-      int deleteError = 0;
-      try {
-         for (int loopIndex = 0; loopIndex < loopCount; loopIndex ++) {
-            int partialResult = compPool.take().get();
-            if (LOG.isTraceEnabled()) LOG.trace("deleteEntriesOlderThanASN partial result: " + partialResult + " loopIndex " + loopIndex);
-         }
-      }
-      catch (Exception e2) {
-         LOG.error("exception retieving replys in deleteEntriesOlderThanASN for interval ASN: " + pv_ASN
-                 + " " + e2);
-         throw new IOException(e2);
-      }
+
       if (LOG.isTraceEnabled()) LOG.trace("deleteEntriesOlderThanASN tlog callable requests completed in thread "
             + threadId);
       return;


[2/5] incubator-trafodion git commit: Merge branch 'master' of github.com:apache/incubator-trafodion into sean_traf

Posted by db...@apache.org.
Merge branch 'master' of github.com:apache/incubator-trafodion into sean_traf


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

Branch: refs/heads/master
Commit: 69fe570bc743765446a873792be810638a191bdc
Parents: 8007949 4c3bb2b
Author: Sean Broeder <sb...@edev06.novalocal>
Authored: Tue Jun 7 21:41:56 2016 +0000
Committer: Sean Broeder <sb...@edev06.novalocal>
Committed: Tue Jun 7 21:41:56 2016 +0000

----------------------------------------------------------------------
 .gitattributes                                  |    6 -
 .gitignore                                      |    1 +
 .rat-excludes                                   |    2 +-
 Makefile                                        |    1 +
 core/Makefile                                   |   14 +-
 core/conn/Makefile                              |    5 +-
 core/conn/jdbcT4/Makefile                       |    1 +
 core/conn/jdbcT4/pom.xml                        |    7 +-
 .../jdbcT4/src/main/java/T4Messages.properties  |   10 +-
 .../java/org/trafodion/jdbc/t4/Address.java     |    2 +-
 .../jdbc/t4/HPT4ConnectionPoolDataSource.java   |  346 ----
 .../t4/HPT4ConnectionPoolDataSourceFactory.java |   68 -
 .../org/trafodion/jdbc/t4/HPT4DataSource.java   |  366 ----
 .../jdbc/t4/HPT4DataSourceFactory.java          |   62 -
 .../java/org/trafodion/jdbc/t4/HPT4Desc.java    |  542 ------
 .../org/trafodion/jdbc/t4/HPT4Exception.java    |   38 -
 .../java/org/trafodion/jdbc/t4/HPT4Handle.java  |   84 -
 .../org/trafodion/jdbc/t4/HPT4Messages.java     |  324 ----
 .../jdbc/t4/HPT4ParameterMetaData.java          |  243 ---
 .../trafodion/jdbc/t4/HPT4PooledConnection.java |  238 ---
 .../jdbc/t4/HPT4PooledConnectionManager.java    |  385 ----
 .../jdbc/t4/HPT4ResultSetMetaData.java          |  309 ---
 .../jdbc/t4/InitializeDialogueReply.java        |    6 +-
 .../java/org/trafodion/jdbc/t4/InputOutput.java |   50 +-
 .../trafodion/jdbc/t4/InterfaceConnection.java  |   52 +-
 .../trafodion/jdbc/t4/InterfaceResultSet.java   |   34 +-
 .../trafodion/jdbc/t4/InterfaceStatement.java   |  148 +-
 .../java/org/trafodion/jdbc/t4/NCSAddress.java  |   22 +-
 .../jdbc/t4/PreparedStatementManager.java       |    2 +-
 .../java/org/trafodion/jdbc/t4/T4Address.java   |   24 +-
 .../org/trafodion/jdbc/t4/T4Connection.java     |   36 +-
 .../org/trafodion/jdbc/t4/T4DSProperties.java   |    6 +-
 .../trafodion/jdbc/t4/T4DatabaseMetaData.java   |  132 +-
 .../java/org/trafodion/jdbc/t4/T4Driver.java    |   14 +-
 .../org/trafodion/jdbc/t4/T4Properties.java     |   20 +-
 .../java/org/trafodion/jdbc/t4/T4ResultSet.java |   12 +-
 .../java/org/trafodion/jdbc/t4/T4Statement.java |   20 +-
 .../org/trafodion/jdbc/t4/T4_Dcs_Cancel.java    |    2 +-
 .../org/trafodion/jdbc/t4/T4_Dcs_Connect.java   |   10 +-
 .../jdbc/t4/TrafT4CallableStatement.java        |   58 +-
 .../org/trafodion/jdbc/t4/TrafT4Connection.java |  108 +-
 .../jdbc/t4/TrafT4ConnectionPoolDataSource.java |  346 ++++
 .../TrafT4ConnectionPoolDataSourceFactory.java  |   68 +
 .../org/trafodion/jdbc/t4/TrafT4DataSource.java |  366 ++++
 .../jdbc/t4/TrafT4DataSourceFactory.java        |   62 +
 .../java/org/trafodion/jdbc/t4/TrafT4Desc.java  |  542 ++++++
 .../org/trafodion/jdbc/t4/TrafT4Exception.java  |   38 +
 .../org/trafodion/jdbc/t4/TrafT4Handle.java     |   84 +
 .../org/trafodion/jdbc/t4/TrafT4Messages.java   |  324 ++++
 .../jdbc/t4/TrafT4ParameterMetaData.java        |  243 +++
 .../jdbc/t4/TrafT4PooledConnection.java         |  238 +++
 .../jdbc/t4/TrafT4PooledConnectionManager.java  |  385 ++++
 .../jdbc/t4/TrafT4PreparedStatement.java        |  118 +-
 .../org/trafodion/jdbc/t4/TrafT4ResultSet.java  |  296 +--
 .../jdbc/t4/TrafT4ResultSetMetaData.java        |  309 +++
 .../org/trafodion/jdbc/t4/TrafT4Statement.java  |   70 +-
 .../java/org/trafodion/jdbc/t4/Utility.java     |   24 +-
 .../jdbc/t4/odbc_Dcs_GetObjRefHdl_exc_.java     |   16 +-
 .../jdbc/t4/odbc_Dcs_StopSrvr_exc_.java         |    8 +-
 .../jdbc/t4/odbc_SQLSvc_Close_exc_.java         |    8 +-
 .../t4/odbc_SQLSvc_EndTransaction_exc_.java     |    8 +-
 .../jdbc/t4/odbc_SQLSvc_Execute_exc_.java       |   10 +-
 .../jdbc/t4/odbc_SQLSvc_Fetch_exc_.java         |   10 +-
 .../t4/odbc_SQLSvc_GetSQLCatalogs_exc_.java     |    6 +-
 .../t4/odbc_SQLSvc_InitializeDialogue_exc_.java |    6 +-
 .../jdbc/t4/odbc_SQLSvc_Prepare_exc_.java       |   10 +-
 .../odbc_SQLSvc_SetConnectionOption_exc_.java   |   12 +-
 .../t4/odbc_SQLSvc_TerminateDialogue_exc_.java  |    8 +-
 .../java/org/trafodion/jdbc/t4/RunAllTests.java |    2 +
 core/conn/jdbc_type2/Makefile                   |    2 +-
 core/conn/jdbc_type2/build.xml                  |   11 +-
 core/conn/jdbc_type2/native/SQLMXDriver.cpp     |   38 +-
 core/conn/jdbc_type2/native/SrvrCommon.cpp      |    4 +-
 core/conn/odb/build.bat                         |   56 +
 core/conn/odb/odb/odb.vcxproj                   |    2 +
 core/conn/odbc/src/odbc/Makefile                |    8 +-
 core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.cpp |   39 +-
 .../odbc/src/odbc/nsksrvrcore/srvrothers.cpp    |    4 +-
 core/conn/trafci/install/Installer.java         |    7 +-
 .../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 +
 .../odbc/odbcclient/unixcli/makefile.lnx        |    6 +-
 .../odbc/odbcclient/unixcli/package/TRAFDSN     |    2 +-
 .../odbc/odbcclient/unixcli/package/mklnxpkg.sh |    2 +
 .../unixcli/package/runconnect_test.sh          |   26 +
 core/dbsecurity/scripts/sqcertgen               |    5 -
 core/dbsecurity/scripts/update_auth             |    9 +-
 core/rest/Makefile                              |   16 +-
 core/rest/bin/rest-daemon.sh                    |    3 -
 core/rest/conf/log4j.properties                 |    2 +-
 core/rest/pom.xml                               |   40 +-
 core/rest/src/assembly/all.xml                  |   11 +-
 .../org/trafodion/rest/util/JdbcT4Util.java     |    6 +-
 core/sqf/.gitignore                             |    4 +
 core/sqf/Makefile                               |   22 +-
 core/sqf/samples/.gitignore                     |    4 +
 core/sqf/sql/scripts/dcscheck                   |   20 +-
 core/sqf/sql/scripts/genms                      |    3 +
 core/sqf/sql/scripts/install_traf_components    |   53 +-
 core/sqf/sql/scripts/sqcheck                    |   57 +-
 core/sqf/sqvers                                 |    2 +-
 .../client/TrafParallelClientScanner.java.tmpl  |    7 +-
 .../hbase/client/transactional/RMInterface.java |   43 +-
 .../RetryTransactionException.java              |   54 +
 .../RollbackUnsuccessfulException.java          |   62 +
 .../transactional/SsccTransactionalTable.java   |   34 +-
 .../hbase/client/transactional/TmDDL.java       |   24 +-
 .../transactional/TransactionManager.java       |  626 +++---
 .../TransactionalScanner.java.tmpl              |   99 +-
 .../transactional/TransactionalTable.java       |   46 +-
 .../transactional/SplitBalanceHelper.java       |   51 +-
 .../transactional/TrxRegionObserver.java.tmpl   |    4 +-
 .../transactional/IdTmException.java            |   14 +
 .../java/org/trafodion/dtm/HBaseTxClient.java   |    7 +-
 core/sql/arkcmp/CmpStatement.cpp                |   42 +-
 core/sql/bin/SqlciErrors.txt                    |    6 +-
 core/sql/cli/Cli.cpp                            |   49 +-
 core/sql/cli/CliExtern.cpp                      |    1 -
 core/sql/cli/Context.cpp                        |  116 +-
 core/sql/cli/Context.h                          |    2 +
 core/sql/cli/ExSqlComp.cpp                      |   22 +-
 core/sql/cli/ExSqlComp.h                        |    2 +
 core/sql/cli/SessionDefaults.cpp                |   18 +-
 core/sql/cli/SessionDefaults.h                  |   23 +-
 core/sql/cli/Statement.cpp                      |    2 +-
 core/sql/cli/sqlcli.h                           |    2 +
 core/sql/comexe/ComTdbExeUtil.cpp               |   29 +-
 core/sql/comexe/ComTdbExeUtil.h                 |   46 +-
 core/sql/comexe/ComTdbFastTransport.cpp         |    6 +-
 core/sql/comexe/ComTdbFastTransport.h           |    7 +-
 core/sql/comexe/ComTdbHdfsScan.cpp              |   62 +-
 core/sql/comexe/ComTdbHdfsScan.h                |   75 +-
 core/sql/common/CharType.cpp                    |    4 +
 core/sql/common/CharType.h                      |    1 +
 core/sql/common/ComSmallDefs.h                  |    3 +
 core/sql/executor/ExExeUtil.h                   |   15 +-
 core/sql/executor/ExExeUtilCli.cpp              |    5 +-
 core/sql/executor/ExExeUtilGet.cpp              |  226 ++-
 core/sql/executor/ExExeUtilLoad.cpp             |    2 +-
 core/sql/executor/ExExeUtilMisc.cpp             |  129 +-
 core/sql/executor/ExFastTransport.cpp           |  117 +-
 core/sql/executor/ExFastTransport.h             |    5 +
 core/sql/executor/ExHdfsScan.cpp                |  120 +-
 core/sql/executor/ExHdfsScan.h                  |   13 +-
 core/sql/executor/ex_control.cpp                |   12 +
 core/sql/executor/hiveHook.cpp                  |   27 +-
 core/sql/exp/ExpErrorEnums.h                    |    1 +
 core/sql/exp/ExpLOB.cpp                         |   35 +-
 core/sql/exp/ExpLOB.h                           |   14 +-
 core/sql/exp/ExpLOBaccess.cpp                   |  294 ++-
 core/sql/exp/ExpLOBaccess.h                     |   81 +-
 core/sql/exp/ExpLOBenums.h                      |    6 +-
 core/sql/exp/ExpLOBinterface.cpp                |   54 +-
 core/sql/exp/ExpLOBinterface.h                  |   10 +
 core/sql/generator/GenFastTransport.cpp         |   67 +-
 core/sql/generator/GenPreCode.cpp               |   42 +-
 core/sql/generator/GenRelExeUtil.cpp            |   20 +-
 core/sql/generator/GenRelScan.cpp               |   89 +-
 core/sql/generator/Generator.cpp                |    3 +-
 core/sql/lib_mgmt/pom.xml                       |    2 +-
 core/sql/optimizer/BindRelExpr.cpp              |  190 +-
 core/sql/optimizer/BindWA.h                     |    1 +
 core/sql/optimizer/HDFSHook.cpp                 |    6 +
 core/sql/optimizer/HDFSHook.h                   |   11 +
 core/sql/optimizer/ItemFunc.h                   |    5 +
 core/sql/optimizer/NAColumn.h                   |    2 +-
 core/sql/optimizer/NATable.cpp                  |   83 +-
 core/sql/optimizer/NormRelExpr.cpp              |    4 +-
 core/sql/optimizer/RelExeUtil.cpp               |   39 +-
 core/sql/optimizer/RelExeUtil.h                 |    9 +-
 core/sql/optimizer/RelExpr.cpp                  |    2 +-
 core/sql/optimizer/RelFastTransport.cpp         |    6 +-
 core/sql/optimizer/RelFastTransport.h           |   32 +-
 core/sql/optimizer/RelUpdate.h                  |    5 +
 core/sql/optimizer/ScanOptimizer.cpp            |    6 +
 core/sql/optimizer/hiveHook.h                   |   25 +-
 core/sql/parser/ElemDDLCol.cpp                  |    2 +-
 core/sql/parser/SqlParserGlobalsCmn.h           |   52 +-
 core/sql/parser/sqlparser.y                     |   33 +-
 core/sql/regress/core/EXPECTED162               |   22 +-
 core/sql/regress/executor/EXPECTED013.SB        |   42 +-
 core/sql/regress/executor/EXPECTED020           |    5 +
 core/sql/regress/executor/EXPECTED130           |  293 ++-
 core/sql/regress/executor/EXPECTED140           |  317 ++-
 core/sql/regress/executor/FILTER140             |    4 +
 core/sql/regress/executor/TEST013               |    4 -
 core/sql/regress/executor/TEST130               |   50 +-
 core/sql/regress/executor/TEST130_argfile2      |    3 +
 core/sql/regress/executor/TEST140               |   94 +-
 core/sql/regress/hive/EXPECTED001               |   22 +-
 core/sql/regress/hive/EXPECTED003               |  320 +--
 core/sql/regress/hive/EXPECTED004               |  240 +--
 core/sql/regress/hive/EXPECTED005               |  212 +-
 core/sql/regress/hive/EXPECTED006               |   19 +-
 core/sql/regress/hive/EXPECTED015               |   71 +-
 core/sql/regress/hive/EXPECTED018               |  633 +++---
 core/sql/regress/hive/TEST003                   |   23 +-
 core/sql/regress/hive/TEST005                   |   48 +-
 core/sql/regress/hive/TEST005_a.hive.sql        |    8 +-
 core/sql/regress/hive/TEST006                   |    1 -
 core/sql/regress/hive/TEST015                   |    3 +-
 core/sql/regress/hive/TEST018                   |   58 +-
 .../hive/TEST018_create_hive_tables.hive        |   16 +-
 core/sql/regress/hive/tbl_type.data             |    2 +-
 core/sql/regress/privs1/EXPECTED133             |  Bin 26383 -> 26390 bytes
 core/sql/regress/privs1/TEST133                 |    2 +-
 core/sql/regress/tools/runallsb                 |    2 +-
 core/sql/regress/tools/runregr_executor.ksh     |    2 +-
 core/sql/regress/tools/runregr_hive.ksh         |   39 +-
 core/sql/sqlcomp/CmpDDLCatErrorCodes.h          |    2 +-
 core/sql/sqlcomp/CmpSeabaseDDLauth.cpp          |  108 +-
 core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp        |  141 +-
 core/sql/sqlcomp/CmpSeabaseDDLschema.cpp        |    2 +-
 core/sql/sqlcomp/CmpSeabaseDDLtable.cpp         |    9 +-
 core/sql/sqlcomp/DefaultConstants.h             |   15 +-
 core/sql/sqlcomp/NADefaults.h                   |    4 +-
 core/sql/sqlcomp/nadefaults.cpp                 |  127 +-
 core/sql/sqludr/SqlUdrPredefLogReader.cpp       |   20 +-
 .../java/org/trafodion/sql/ByteArrayList.java   |   54 -
 .../java/org/trafodion/sql/HBaseClient.java     |   76 +-
 .../java/org/trafodion/sql/HBulkLoadClient.java |   42 +-
 .../java/org/trafodion/sql/HTableClient.java    |   23 +-
 .../main/java/org/trafodion/sql/HiveClient.java |   59 +-
 .../java/org/trafodion/sql/ResultIterator.java  |  133 --
 .../org/trafodion/sql/ResultKeyValueList.java   |  100 -
 .../java/org/trafodion/sql/RowToInsert.java     |   44 -
 .../java/org/trafodion/sql/RowsToInsert.java    |   57 -
 .../org/trafodion/sql/SequenceFileWriter.java   |  129 +-
 .../java/org/trafodion/sql/StringArrayList.java |   47 -
 core/sql/ustat/hs_const.h                       |    1 +
 core/sql/ustat/hs_globals.cpp                   |  255 ++-
 core/sql/ustat/hs_globals.h                     |    4 +
 core/sql/ustat/hs_la.cpp                        |   36 +-
 core/sql/ustat/hs_la.h                          |   23 +-
 core/sql/ustat/hs_parser.cpp                    |   13 +
 dcs/Makefile                                    |   17 +-
 dcs/pom.xml                                     |   46 +-
 dcs/src/assembly/all.xml                        |    8 +-
 .../java/org/trafodion/dcs/util/JdbcT4Util.java |   24 +-
 .../src/asciidoc/_chapters/jdbct4.adoc          |    9 +-
 .../src/asciidoc/_chapters/odbc_windows.adoc    |    6 +-
 .../src/asciidoc/_chapters/commands.adoc        |    4 +-
 .../src/asciidoc/_chapters/activate.adoc        |    2 +-
 .../src/asciidoc/_chapters/enable_security.adoc |   12 +-
 .../src/asciidoc/_chapters/introduction.adoc    |   26 +-
 .../src/asciidoc/_chapters/prepare.adoc         |   12 +-
 .../src/asciidoc/_chapters/requirements.adoc    |    6 +-
 .../src/asciidoc/_chapters/script_install.adoc  |   38 +-
 .../src/asciidoc/_chapters/script_remove.adoc   |    8 +-
 .../src/asciidoc/_chapters/script_upgrade.adoc  |   26 +-
 .../src/asciidoc/_chapters/sql_statements.adoc  |    9 +-
 docs/src/site/markdown/documentation.md         |    2 +
 docs/src/site/markdown/download.md              |    6 +-
 docs/src/site/markdown/index.md                 |   16 +-
 docs/src/site/resources/css/site.css            |    2 +-
 docs/src/site/site.xml                          |    3 +-
 install/Makefile                                |   18 +-
 install/installer/dcs_installer                 |   19 +-
 install/installer/rest_installer                |   21 +-
 .../installer/traf_apache_hadoop_config_setup   |  842 --------
 install/installer/traf_cloudera_mods            |    3 +-
 install/installer/traf_config                   |   62 +-
 install/installer/traf_config_check             |   44 +-
 install/installer/traf_config_setup             |   69 +-
 install/installer/traf_hortonworks_mods         |    4 +-
 install/installer/traf_package_setup            |    4 +-
 .../installer/trafodion_apache_hadoop_install   |  763 --------
 install/installer/trafodion_config_default      |   14 +-
 install/installer/trafodion_install             |  154 +-
 install/traf_tools_setup.sh                     |    1 +
 licenses/Makefile                               |   15 +-
 licenses/lic-dcs-bin                            |  652 -------
 licenses/lic-dcs-src                            |   69 -
 licenses/lic-rest-bin                           | 1416 --------------
 licenses/lic-server-bin                         | 1834 ++++++++++++++++++
 licenses/lic-server-src                         |   69 +
 licenses/not-dcs-bin                            |   20 -
 licenses/not-rest-bin                           |   20 -
 licenses/note-server-bin                        |   20 +
 pom.xml                                         |    1 +
 284 files changed, 10889 insertions(+), 11088 deletions(-)
----------------------------------------------------------------------



[5/5] incubator-trafodion git commit: Merge [TRAFODION-1996] PR 533 TLOG memory use, exception logging improvements

Posted by db...@apache.org.
Merge [TRAFODION-1996] PR 533 TLOG memory use, exception logging improvements


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

Branch: refs/heads/master
Commit: d0c0e86c4c9fee306b2f1d916de6e417bed9f1d8
Parents: b4ab018 6b5da39
Author: Dave Birdsall <db...@apache.org>
Authored: Mon Jun 13 19:16:18 2016 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Mon Jun 13 19:16:18 2016 +0000

----------------------------------------------------------------------
 .../transactional/TrxRegionEndpoint.java.tmpl   |  35 ++++---
 .../trafodion/dtm/HBaseAuditControlPoint.java   |   4 +-
 .../java/org/trafodion/dtm/TmAuditTlog.java     | 101 +++++++++----------
 3 files changed, 71 insertions(+), 69 deletions(-)
----------------------------------------------------------------------



[3/5] incubator-trafodion git commit: Merge branch 'master' of github.com:apache/incubator-trafodion into sean_traf

Posted by db...@apache.org.
Merge branch 'master' of github.com:apache/incubator-trafodion into sean_traf


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

Branch: refs/heads/master
Commit: 68653b1a28f782ac084b3c9299e32f0f8c4a6539
Parents: 69fe570 4071b97
Author: Sean Broeder <sb...@edev06.esgyn.local>
Authored: Thu Jun 9 13:55:08 2016 +0000
Committer: Sean Broeder <sb...@edev06.esgyn.local>
Committed: Thu Jun 9 13:55:08 2016 +0000

----------------------------------------------------------------------
 core/sql/sqlcomp/QCache.cpp                               | 4 ++--
 core/sql/src/main/java/org/trafodion/sql/HBaseClient.java | 9 +++++++++
 install/installer/trafodion_install                       | 3 +--
 3 files changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------