From 5a26243a8a605c1f5acb5e25cf61751405eb9a33 Mon Sep 17 00:00:00 2001 From: Ramkrishna Date: Thu, 12 Oct 2017 21:58:48 +0530 Subject: [PATCH] HBASE-18992 Comparators passed to the Memstore's flattened segments seems to be wrong (Ram) --- .../hadoop/hbase/regionserver/CellArrayImmutableSegment.java | 2 +- .../hadoop/hbase/regionserver/CellChunkImmutableSegment.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CellArrayImmutableSegment.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CellArrayImmutableSegment.java index a4b8c7b8352..e112eaad914 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CellArrayImmutableSegment.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CellArrayImmutableSegment.java @@ -125,7 +125,7 @@ public class CellArrayImmutableSegment extends ImmutableSegment { segmentScanner.close(); } // build the immutable CellSet - CellArrayMap cam = new CellArrayMap(CellComparator.COMPARATOR, cells, 0, idx, false); + CellArrayMap cam = new CellArrayMap(getComparator(), cells, 0, idx, false); this.setCellSet(oldCellSet, new CellSet(cam)); // update the CellSet of this Segment } diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CellChunkImmutableSegment.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CellChunkImmutableSegment.java index 62b62da54af..62ed0c900c2 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CellChunkImmutableSegment.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CellChunkImmutableSegment.java @@ -124,7 +124,7 @@ public class CellChunkImmutableSegment extends ImmutableSegment { } // build the immutable CellSet CellChunkMap ccm = - new CellChunkMap(CellComparator.COMPARATOR,chunks,0,numOfCellsAfterCompaction,false); + new CellChunkMap(getComparator(), chunks, 0, numOfCellsAfterCompaction, false); this.setCellSet(null, new CellSet(ccm)); // update the CellSet of this Segment } @@ -167,7 +167,7 @@ public class CellChunkImmutableSegment extends ImmutableSegment { segmentScanner.close(); } - CellChunkMap ccm = new CellChunkMap(CellComparator.COMPARATOR,chunks,0,numOfCells,false); + CellChunkMap ccm = new CellChunkMap(getComparator(), chunks, 0, numOfCells, false); this.setCellSet(oldCellSet, new CellSet(ccm)); // update the CellSet of this Segment }