[CARBONDATA-2971] Add shard info of blocklet for debugging add toString method to print both shard name and blocklet id for debugging.
This closes #2765 Project: http://git-wip-us.apache.org/repos/asf/carbondata/repo Commit: http://git-wip-us.apache.org/repos/asf/carbondata/commit/5c0da31a Tree: http://git-wip-us.apache.org/repos/asf/carbondata/tree/5c0da31a Diff: http://git-wip-us.apache.org/repos/asf/carbondata/diff/5c0da31a Branch: refs/heads/branch-1.5 Commit: 5c0da31a5a0afaf707455fa80ac431a082a57ec9 Parents: 3cd8b94 Author: Manhua <[email protected]> Authored: Wed Sep 26 10:34:54 2018 +0800 Committer: xuchuanyin <[email protected]> Committed: Thu Sep 27 11:37:56 2018 +0800 ---------------------------------------------------------------------- .../carbondata/core/indexstore/Blocklet.java | 21 ++++++++++++++++---- .../blockletindex/BlockletDataMapFactory.java | 2 +- 2 files changed, 18 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/carbondata/blob/5c0da31a/core/src/main/java/org/apache/carbondata/core/indexstore/Blocklet.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/indexstore/Blocklet.java b/core/src/main/java/org/apache/carbondata/core/indexstore/Blocklet.java index c6e1681..3270d08 100644 --- a/core/src/main/java/org/apache/carbondata/core/indexstore/Blocklet.java +++ b/core/src/main/java/org/apache/carbondata/core/indexstore/Blocklet.java @@ -65,17 +65,20 @@ public class Blocklet implements Writable,Serializable { return filePath; } - @Override public void write(DataOutput out) throws IOException { + @Override + public void write(DataOutput out) throws IOException { out.writeUTF(filePath); out.writeUTF(blockletId); } - @Override public void readFields(DataInput in) throws IOException { + @Override + public void readFields(DataInput in) throws IOException { filePath = in.readUTF(); blockletId = in.readUTF(); } - @Override public boolean equals(Object o) { + @Override + public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; @@ -92,7 +95,17 @@ public class Blocklet implements Writable,Serializable { blocklet.blockletId == null; } - @Override public int hashCode() { + @Override + public String toString() { + final StringBuffer sb = new StringBuffer("Blocklet{"); + sb.append("filePath='").append(filePath).append('\''); + sb.append(", blockletId='").append(blockletId).append('\''); + sb.append('}'); + return sb.toString(); + } + + @Override + public int hashCode() { int result = filePath != null ? filePath.hashCode() : 0; result = 31 * result; if (compareBlockletIdForObjectMatching) { http://git-wip-us.apache.org/repos/asf/carbondata/blob/5c0da31a/core/src/main/java/org/apache/carbondata/core/indexstore/blockletindex/BlockletDataMapFactory.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/indexstore/blockletindex/BlockletDataMapFactory.java b/core/src/main/java/org/apache/carbondata/core/indexstore/blockletindex/BlockletDataMapFactory.java index e16c3cd..096a5e3 100644 --- a/core/src/main/java/org/apache/carbondata/core/indexstore/blockletindex/BlockletDataMapFactory.java +++ b/core/src/main/java/org/apache/carbondata/core/indexstore/blockletindex/BlockletDataMapFactory.java @@ -252,7 +252,7 @@ public class BlockletDataMapFactory extends CoarseGrainDataMapFactory } } } - throw new IOException("Blocklet with blockid " + blocklet.getBlockletId() + " not found "); + throw new IOException("Blocklet not found: " + blocklet.toString()); }
