Skip to content

Commit

Permalink
Merge pull request apache#16 from jackylk/reformat
Browse files Browse the repository at this point in the history
reformating
  • Loading branch information
Jacky Li committed Nov 6, 2014
2 parents 18c96f0 + 0306443 commit adecb45
Showing 1 changed file with 6 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -168,20 +168,20 @@ case class BulkLoadIntoTable(path: String, relation: HBaseRelation, isLocal: Boo
var preKV: (ImmutableBytesWritableWrapper, PutWrapper) = null
var nowKV: (ImmutableBytesWritableWrapper, PutWrapper) = null
val ret = new ArrayBuffer[(ImmutableBytesWritable, KeyValue)]()
if(iter.hasNext) {
if (iter.hasNext) {
preKV = iter.next()
var cellsIter = preKV._2.toPut().getFamilyCellMap.values().iterator()
while(cellsIter.hasNext()) {
while (cellsIter.hasNext()) {
cellsIter.next().foreach { cell =>
val kv = KeyValueUtil.ensureKeyValue(cell)
map.add(kv)
}
}
while(iter.hasNext) {
while (iter.hasNext) {
nowKV = iter.next()
if(0 == (nowKV._1 compareTo preKV._1)) {
if (0 == (nowKV._1 compareTo preKV._1)) {
cellsIter = nowKV._2.toPut().getFamilyCellMap.values().iterator()
while(cellsIter.hasNext()) {
while (cellsIter.hasNext()) {
cellsIter.next().foreach { cell =>
val kv = KeyValueUtil.ensureKeyValue(cell)
map.add(kv)
Expand All @@ -192,7 +192,7 @@ case class BulkLoadIntoTable(path: String, relation: HBaseRelation, isLocal: Boo
preKV = nowKV
map.clear()
cellsIter = preKV._2.toPut().getFamilyCellMap.values().iterator()
while(cellsIter.hasNext()) {
while (cellsIter.hasNext()) {
cellsIter.next().foreach { cell =>
val kv = KeyValueUtil.ensureKeyValue(cell)
map.add(kv)
Expand Down

0 comments on commit adecb45

Please sign in to comment.