You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by su...@apache.org on 2016/11/11 18:11:58 UTC
[1/2] incubator-trafodion git commit: [TRAFODION-2351] Bulk load with
log error rows enhancements [Trafodion 2325] Reduce path length by avoiding
expensive APIs
Repository: incubator-trafodion
Updated Branches:
refs/heads/master 575490c5f -> e17bdcd2d
[TRAFODION-2351] Bulk load with log error rows enhancements
[Trafodion 2325] Reduce path length by avoiding expensive APIs
Load with log error rows missing some error rows being logged.
The hdfs file where the error rows are not logged wasn't closed
Avoided unnecessary copy of the transactional put list
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/fd268be1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/fd268be1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/fd268be1
Branch: refs/heads/master
Commit: fd268be1fcca1b260a0a20a2c4f0c6a7d291f591
Parents: 12ead26
Author: selvaganesang <se...@esgyn.com>
Authored: Thu Nov 10 19:59:14 2016 +0000
Committer: selvaganesang <se...@esgyn.com>
Committed: Thu Nov 10 19:59:14 2016 +0000
----------------------------------------------------------------------
.../hbase/client/transactional/TransactionalTable.java | 8 ++------
core/sql/executor/ExHbaseIUD.cpp | 4 +---
core/sql/executor/ExHdfsScan.cpp | 5 +----
3 files changed, 4 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fd268be1/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransactionalTable.java
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransactionalTable.java b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransactionalTable.java
index 9fcf7b3..a7d99c0 100644
--- a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransactionalTable.java
+++ b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransactionalTable.java
@@ -867,10 +867,8 @@ public class TransactionalTable extends HTable implements TransactionalTableClie
size++;
}
- final List<Delete> rowsInSameRegion = new ArrayList<Delete>();
for (Map.Entry<TransactionRegionLocation, List<Delete>> entry : rows.entrySet()) {
- rowsInSameRegion.clear();
- rowsInSameRegion.addAll(entry.getValue());
+ final List<Delete> rowsInSameRegion = entry.getValue();
final String regionName = entry.getKey().getRegionInfo().getRegionNameAsString();
Batch.Call<TrxRegionService, DeleteMultipleTransactionalResponse> callable =
@@ -965,10 +963,8 @@ public class TransactionalTable extends HTable implements TransactionalTableClie
size++;
}
- final List<Put> rowsInSameRegion = new ArrayList<Put>();
for (Map.Entry<TransactionRegionLocation, List<Put>> entry : rows.entrySet()) {
- rowsInSameRegion.clear();
- rowsInSameRegion.addAll(entry.getValue());
+ final List<Put> rowsInSameRegion = entry.getValue();
final String regionName = entry.getKey().getRegionInfo().getRegionNameAsString();
Batch.Call<TrxRegionService, PutMultipleTransactionalResponse> callable =
new Batch.Call<TrxRegionService, PutMultipleTransactionalResponse>() {
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fd268be1/core/sql/executor/ExHbaseIUD.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExHbaseIUD.cpp b/core/sql/executor/ExHbaseIUD.cpp
index 7024eec..d3106f3 100644
--- a/core/sql/executor/ExHbaseIUD.cpp
+++ b/core/sql/executor/ExHbaseIUD.cpp
@@ -1679,9 +1679,7 @@ ExWorkProcRetcode ExHbaseAccessBulkLoadPrepSQTcb::work()
if (eodSeen)
{
ehi_->closeHFile(table_);
- // sss This is one place that is unconditionally closing the
- // hdfsFs that's part of this thread's JNIenv.
- //ehi_->hdfsClose();
+ ehi_->hdfsClose();
hFileParamsInitialized_ = false;
retcode = ehi_->close();
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fd268be1/core/sql/executor/ExHdfsScan.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExHdfsScan.cpp b/core/sql/executor/ExHdfsScan.cpp
index 1169bb7..8c630fd 100644
--- a/core/sql/executor/ExHdfsScan.cpp
+++ b/core/sql/executor/ExHdfsScan.cpp
@@ -1479,10 +1479,7 @@ ExWorkProcRetcode ExHdfsScanTcb::work()
getLobErrStr(intParam1));
pentry_down->setDiagsArea(diagsArea);
}
- // sss This is one place that is unconditionally closing the
- // hdfsFs that's part of this thread's JNIenv.
- // if (ehi_)
- // retcode = ehi_->hdfsClose();
+ retcode = ehi_->hdfsClose();
}
if (step_ == CLOSE_FILE)
{
[2/2] incubator-trafodion git commit: Merge [TRAFODION-2351] PR-829
Bulk load with log error rows enhancements
Posted by su...@apache.org.
Merge [TRAFODION-2351] PR-829 Bulk load with log error rows enhancements
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/e17bdcd2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/e17bdcd2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/e17bdcd2
Branch: refs/heads/master
Commit: e17bdcd2d6cbf8dbdbe82370641e751275cf4808
Parents: 575490c fd268be
Author: Suresh Subbiah <su...@apache.org>
Authored: Fri Nov 11 18:11:14 2016 +0000
Committer: Suresh Subbiah <su...@apache.org>
Committed: Fri Nov 11 18:11:14 2016 +0000
----------------------------------------------------------------------
.../hbase/client/transactional/TransactionalTable.java | 8 ++------
core/sql/executor/ExHbaseIUD.cpp | 4 +---
core/sql/executor/ExHdfsScan.cpp | 5 +----
3 files changed, 4 insertions(+), 13 deletions(-)
----------------------------------------------------------------------