Repository: incubator-pirk Updated Branches: refs/heads/master 46ad9ce69 -> d2ca2cfe7
[trivial] -- minor code fixes - closes apache/incubator-pirk#10 Project: http://git-wip-us.apache.org/repos/asf/incubator-pirk/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-pirk/commit/d2ca2cfe Tree: http://git-wip-us.apache.org/repos/asf/incubator-pirk/tree/d2ca2cfe Diff: http://git-wip-us.apache.org/repos/asf/incubator-pirk/diff/d2ca2cfe Branch: refs/heads/master Commit: d2ca2cfe7c81438141c615aee21115e5fb74411f Parents: 46ad9ce Author: tellison <[email protected]> Authored: Tue Jul 19 08:32:54 2016 -0400 Committer: eawilliams <[email protected]> Committed: Tue Jul 19 08:32:54 2016 -0400 ---------------------------------------------------------------------- .../wideskies/standalone/Responder.java | 7 +++---- .../partitioner/PrimitiveTypePartitioner.java | 2 +- .../apache/pirk/test/utils/StandaloneQuery.java | 20 +++----------------- 3 files changed, 7 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/d2ca2cfe/src/main/java/org/apache/pirk/responder/wideskies/standalone/Responder.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/pirk/responder/wideskies/standalone/Responder.java b/src/main/java/org/apache/pirk/responder/wideskies/standalone/Responder.java index cd04f06..d851d70 100644 --- a/src/main/java/org/apache/pirk/responder/wideskies/standalone/Responder.java +++ b/src/main/java/org/apache/pirk/responder/wideskies/standalone/Responder.java @@ -104,22 +104,21 @@ public class Responder String inputData = SystemConfiguration.getProperty("pir.inputData"); try { - FileReader fr = new FileReader(new File(inputData)); - BufferedReader br = new BufferedReader(fr); + BufferedReader br = new BufferedReader(new FileReader(inputData)); String line; - JSONObject jsonData; JSONParser jsonParser = new JSONParser(); while ((line = br.readLine()) != null) { logger.info("line = " + line); - jsonData = (JSONObject) jsonParser.parse(line); + JSONObject jsonData = (JSONObject) jsonParser.parse(line); logger.info("jsonData = " + jsonData.toJSONString()); String selector = QueryUtils.getSelectorByQueryTypeJSON(queryType, jsonData); addDataElement(selector, jsonData); } + br.close(); } catch (Exception e) { e.printStackTrace(); http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/d2ca2cfe/src/main/java/org/apache/pirk/schema/data/partitioner/PrimitiveTypePartitioner.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/pirk/schema/data/partitioner/PrimitiveTypePartitioner.java b/src/main/java/org/apache/pirk/schema/data/partitioner/PrimitiveTypePartitioner.java index 63383e4..2c475d9 100644 --- a/src/main/java/org/apache/pirk/schema/data/partitioner/PrimitiveTypePartitioner.java +++ b/src/main/java/org/apache/pirk/schema/data/partitioner/PrimitiveTypePartitioner.java @@ -213,7 +213,7 @@ public class PrimitiveTypePartitioner implements DataPartitioner if (type.equals(BYTE)) { BigInteger bInt = parts.get(partsIndex); - element = new Byte(bInt.toString()).byteValue(); + element = Byte.valueOf(bInt.toString()); } else if (type.equals(SHORT)) { http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/d2ca2cfe/src/main/java/org/apache/pirk/test/utils/StandaloneQuery.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/pirk/test/utils/StandaloneQuery.java b/src/main/java/org/apache/pirk/test/utils/StandaloneQuery.java index 253ce65..027e042 100644 --- a/src/main/java/org/apache/pirk/test/utils/StandaloneQuery.java +++ b/src/main/java/org/apache/pirk/test/utils/StandaloneQuery.java @@ -73,23 +73,9 @@ public class StandaloneQuery logger.info("fileQuerier = " + fileQuerier.getAbsolutePath() + " fileQuery = " + fileQuery.getAbsolutePath() + " responseFile = " + fileResponse.getAbsolutePath() + " fileFinalResults = " + fileFinalResults.getAbsolutePath()); - boolean embedSelector = false; - if (SystemConfiguration.getProperty("pirTest.embedSelector", "false").equals("true")) - { - embedSelector = true; - } - - boolean useExpLookupTable = false; - if (SystemConfiguration.getProperty("pirTest.useExpLookupTable", "false").equals("true")) - { - useExpLookupTable = true; - } - - boolean useHDFSExpLookupTable = false; - if (SystemConfiguration.getProperty("pirTest.useHDFSExpLookupTable", "false").equals("true")) - { - useHDFSExpLookupTable = true; - } + boolean embedSelector = SystemConfiguration.getProperty("pirTest.embedSelector", "false").equals("true"); + boolean useExpLookupTable = SystemConfiguration.getProperty("pirTest.useExpLookupTable", "false").equals("true"); + boolean useHDFSExpLookupTable = SystemConfiguration.getProperty("pirTest.useHDFSExpLookupTable", "false").equals("true"); // Set the necessary objects QueryInfo queryInfo = new QueryInfo(BaseTests.queryNum, selectors.size(), BaseTests.hashBitSize, BaseTests.hashKey, BaseTests.dataPartitionBitSize,
