Repository: carbondata Updated Branches: refs/heads/master 184935827 -> 9b45c5b30
[HOTFIX] Fix JVM crash in search mode This closes #2233 Project: http://git-wip-us.apache.org/repos/asf/carbondata/repo Commit: http://git-wip-us.apache.org/repos/asf/carbondata/commit/9b45c5b3 Tree: http://git-wip-us.apache.org/repos/asf/carbondata/tree/9b45c5b3 Diff: http://git-wip-us.apache.org/repos/asf/carbondata/diff/9b45c5b3 Branch: refs/heads/master Commit: 9b45c5b3000692f6d67694a81fdb07173d1d1572 Parents: 1849358 Author: ravipesala <[email protected]> Authored: Thu Apr 26 18:10:56 2018 +0530 Committer: Jacky Li <[email protected]> Committed: Thu Apr 26 23:16:31 2018 +0800 ---------------------------------------------------------------------- .../apache/carbondata/store/worker/SearchRequestHandler.java | 6 ++++++ 1 file changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/carbondata/blob/9b45c5b3/store/search/src/main/java/org/apache/carbondata/store/worker/SearchRequestHandler.java ---------------------------------------------------------------------- diff --git a/store/search/src/main/java/org/apache/carbondata/store/worker/SearchRequestHandler.java b/store/search/src/main/java/org/apache/carbondata/store/worker/SearchRequestHandler.java index 8296247..7708d8b 100644 --- a/store/search/src/main/java/org/apache/carbondata/store/worker/SearchRequestHandler.java +++ b/store/search/src/main/java/org/apache/carbondata/store/worker/SearchRequestHandler.java @@ -38,6 +38,8 @@ import org.apache.carbondata.core.readcommitter.LatestFilesReadCommittedScope; import org.apache.carbondata.core.scan.expression.Expression; import org.apache.carbondata.core.scan.model.QueryModel; import org.apache.carbondata.core.scan.model.QueryModelBuilder; +import org.apache.carbondata.core.util.CarbonTaskInfo; +import org.apache.carbondata.core.util.ThreadLocalTaskInfo; import org.apache.carbondata.hadoop.CarbonInputSplit; import org.apache.carbondata.hadoop.CarbonMultiBlockSplit; import org.apache.carbondata.hadoop.CarbonRecordReader; @@ -76,12 +78,16 @@ public class SearchRequestHandler { */ private List<CarbonRow> handleRequest(SearchRequest request) throws IOException, InterruptedException { + CarbonTaskInfo carbonTaskInfo = new CarbonTaskInfo(); + carbonTaskInfo.setTaskId(System.nanoTime()); + ThreadLocalTaskInfo.setCarbonTaskInfo(carbonTaskInfo); TableInfo tableInfo = request.tableInfo(); CarbonTable table = CarbonTable.buildFromTableInfo(tableInfo); QueryModel queryModel = createQueryModel(table, request); // in search mode, plain reader is better since it requires less memory queryModel.setVectorReader(false); + CarbonMultiBlockSplit mbSplit = request.split().value(); long limit = request.limit(); long rowCount = 0;
