From 26e95121e59253d1daba84c4e1439dda376b96f6 Mon Sep 17 00:00:00 2001 From: Preston Carman Date: Tue, 24 May 2016 17:43:14 -0700 Subject: [PATCH] VXQUERY-193: Minor clean up items after release. --- NOTICE | 2 +- pom.xml | 66 ++++++++++++------- src/site/apt/development_eclipse_setup.apt | 4 +- src/site/apt/user_installation.apt | 2 +- .../other_systems/basex_scripts/.basex | 0 .../other_systems/basex_scripts/README | 9 --- .../other_systems/basex_scripts/README.md | 26 ++++++++ .../builders/sequence/SequenceBuilder.java | 5 +- .../org/apache/vxquery/xtest/MiniDFS.java | 8 +-- .../vxquery/xtest/ResultFileSorter.java | 12 ++-- 10 files changed, 84 insertions(+), 50 deletions(-) delete mode 100644 vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_scripts/.basex delete mode 100644 vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_scripts/README create mode 100644 vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_scripts/README.md diff --git a/NOTICE b/NOTICE index d1057497d..bf8485b3c 100644 --- a/NOTICE +++ b/NOTICE @@ -1,5 +1,5 @@ Apache VXQuery -Copyright 2009-2015 The Apache Software Foundation +Copyright 2009-2016 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). diff --git a/pom.xml b/pom.xml index 8f7100c1e..dd51adf55 100644 --- a/pom.xml +++ b/pom.xml @@ -527,33 +527,55 @@ --> + + org.apache.maven.plugins + maven-enforcer-plugin + + + enforce-versions + + enforce + + + + + 3.2 + + + 1.8 + + + + + + org.apache.maven.plugins maven-site-plugin - com.google.code.maven-replacer-plugin - replacer - 1.5.3 - - - prepare-package - - replace - - - - - true - vxquery-server/src/main/resources/conf/cluster.properties - - vxquery-server/src/main/resources/conf/cluster.properties - - false - $CONF_PATH$ - ${basedir}/vxquery-xtest/src/test/resources/hadoop/conf - - + com.google.code.maven-replacer-plugin + replacer + 1.5.3 + + + prepare-package + + replace + + + + + true + vxquery-server/src/main/resources/conf/cluster.properties + + vxquery-server/src/main/resources/conf/cluster.properties + + false + $CONF_PATH$ + ${basedir}/vxquery-xtest/src/test/resources/hadoop/conf + + diff --git a/src/site/apt/development_eclipse_setup.apt b/src/site/apt/development_eclipse_setup.apt index 19b5776db..4e733dcde 100644 --- a/src/site/apt/development_eclipse_setup.apt +++ b/src/site/apt/development_eclipse_setup.apt @@ -20,14 +20,14 @@ Eclipse Setup * Installation - * Install Java Development Kit (JDK) 1.7 or Later + * Install Java Development Kit (JDK) 1.8 or Later * Install Classic Eclipse Follow the instruction for eclipse on from {{{http://www.eclipse.org}www.eclipse.org}} for the "Classic" eclipse version. - * Install Apache Maven + * Install Apache Maven 3.2 or later * Install Maven Integration (m2e) diff --git a/src/site/apt/user_installation.apt b/src/site/apt/user_installation.apt index 3005885a5..e55946271 100644 --- a/src/site/apt/user_installation.apt +++ b/src/site/apt/user_installation.apt @@ -19,7 +19,7 @@ Installation * Apache VXQuery\x99 source archive (apache-vxquery-X.Y-source-release.zip) - * JDK >= 1.7 + * JDK >= 1.8 * Apache Maven >= 3.2 diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_scripts/.basex b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_scripts/.basex deleted file mode 100644 index e69de29bb..000000000 diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_scripts/README b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_scripts/README deleted file mode 100644 index 1b910dbad..000000000 --- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_scripts/README +++ /dev/null @@ -1,9 +0,0 @@ -BaseX local configuration options for the weather benchmark. -The options attempt to match the processing and output of VXQuery. - - -# Local Options -CHOP = false -DBPATH = /path/to/basex/BaseXData -REPOPATH = /path/to/basex/BaseXRepo -WEBPATH = /path/to/basex/BaseXWeb diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_scripts/README.md b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_scripts/README.md new file mode 100644 index 000000000..aed265471 --- /dev/null +++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_scripts/README.md @@ -0,0 +1,26 @@ + + +BaseX local configuration options for the weather benchmark. +The options attempt to match the processing and output of VXQuery. + + +# Local Options +CHOP = false +DBPATH = /path/to/basex/BaseXData +REPOPATH = /path/to/basex/BaseXRepo +WEBPATH = /path/to/basex/BaseXWeb diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/sequence/SequenceBuilder.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/sequence/SequenceBuilder.java index fbea14814..5cd31b177 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/sequence/SequenceBuilder.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/sequence/SequenceBuilder.java @@ -29,10 +29,10 @@ public class SequenceBuilder implements IBuilder { private final GrowableIntArray slots = new GrowableIntArray(); private final ArrayBackedValueStorage dataArea = new ArrayBackedValueStorage(); - private IMutableValueStorage mvs; + private DataOutput out; public void reset(IMutableValueStorage mvs) { - this.mvs = mvs; + out = mvs.getDataOutput(); slots.clear(); dataArea.reset(); } @@ -43,7 +43,6 @@ public void addItem(IValueReference p) throws IOException { } public void finish() throws IOException { - DataOutput out = mvs.getDataOutput(); if (slots.getSize() != 1) { out.write(ValueTag.SEQUENCE_TAG); int size = slots.getSize(); diff --git a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/MiniDFS.java b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/MiniDFS.java index 0720baa5f..a6751502f 100644 --- a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/MiniDFS.java +++ b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/MiniDFS.java @@ -28,16 +28,13 @@ public class MiniDFS { private MiniDFSCluster dfsCluster; - - public void miniDFS() { - - } + private static final String PATH_TO_HADOOP_CONF = "src/test/resources/hadoop/conf"; + private static final String DATA_PATH = "src/test/resources/TestSources/ghcnd"; public void startHDFS() throws IOException { FileSystem lfs = FileSystem.getLocal(new Configuration()); JobConf conf = new JobConf(); - String PATH_TO_HADOOP_CONF = "src/test/resources/hadoop/conf"; conf.addResource(new Path(PATH_TO_HADOOP_CONF + "/core-site.xml")); conf.addResource(new Path(PATH_TO_HADOOP_CONF + "/mapred-site.xml")); conf.addResource(new Path(PATH_TO_HADOOP_CONF + "/hdfs-site.xml")); @@ -58,7 +55,6 @@ public void startHDFS() throws IOException { dfsCluster = build.build(); FileSystem dfs = FileSystem.get(conf); - String DATA_PATH = "src/test/resources/TestSources/ghcnd"; Path src = new Path(DATA_PATH); dfs.mkdirs(new Path("/tmp")); Path dest = new Path("/tmp/vxquery-hdfs-test"); diff --git a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/ResultFileSorter.java b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/ResultFileSorter.java index c0481387d..e17a5244f 100644 --- a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/ResultFileSorter.java +++ b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/ResultFileSorter.java @@ -30,8 +30,6 @@ /** * Class to sort the final test results. */ - -//TODO : Optimize for large files. public class ResultFileSorter { private final String path; @@ -45,6 +43,7 @@ public ResultFileSorter(String path) throws FileNotFoundException { * The method to sort the test case results. */ public void sortFile() { + //TODO : Optimize for large files. File resultFile = new File(path); try { FileReader fileReader = new FileReader(resultFile); @@ -54,15 +53,17 @@ public void sortFile() { while ((line = reader.readLine()) != null) { fullText.add(line); } + reader.close(); + fileReader.close(); if (LOGGER.isLoggable(Level.INFO)) { LOGGER.log(Level.INFO, "Sorting....."); } Collections.sort(fullText, String.CASE_INSENSITIVE_ORDER); String[] sortedText = fullText.toArray(new String[fullText.size()]); - this.eraseFile(resultFile); - this.writeToFile(sortedText); + eraseFile(resultFile); + writeToFile(sortedText); } catch (IOException e) { - e.printStackTrace(); + LOGGER.log(Level.SEVERE, "Trouble with sorting the file: " + resultFile.getAbsolutePath(), e); } } @@ -88,7 +89,6 @@ private void writeToFile(String[] text) throws FileNotFoundException { if (LOGGER.isLoggable(Level.INFO)) { LOGGER.log(Level.INFO, "Writing to file started."); } - for (String s : text) { writer.write(s + "\n"); }