pirk-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eawilli...@apache.org
Subject incubator-pirk git commit: [PIRK-44]: Tachyon FS Error -- closes apache/incubator-pirk#50
Date Mon, 08 Aug 2016 21:32:14 GMT
Repository: incubator-pirk
Updated Branches:
  refs/heads/master 2bae78eaa -> 27791ec1b


[PIRK-44]: Tachyon FS Error -- closes apache/incubator-pirk#50


Project: http://git-wip-us.apache.org/repos/asf/incubator-pirk/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-pirk/commit/27791ec1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-pirk/tree/27791ec1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-pirk/diff/27791ec1

Branch: refs/heads/master
Commit: 27791ec1ba0026739a018138267f7cbf485ef230
Parents: 2bae78e
Author: eawilliams <eawilliams@apache.org>
Authored: Mon Aug 8 17:31:09 2016 -0400
Committer: eawilliams <eawilliams@apache.org>
Committed: Mon Aug 8 17:31:09 2016 -0400

----------------------------------------------------------------------
 pom.xml                                         | 115 ++++++++++---------
 .../pirk/schema/data/DataSchemaLoader.java      |  31 +++--
 .../pirk/schema/query/QuerySchemaLoader.java    |  23 ++--
 3 files changed, 84 insertions(+), 85 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/27791ec1/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7d4c0bf..91c67f3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,20 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one or more
-  ~ contributor license agreements.  See the NOTICE file distributed with
-  ~ this work for additional information regarding copyright ownership.
-  ~ The ASF licenses this file to You under the Apache License, Version 2.0
-  ~ (the "License"); you may not use this file except in compliance with
-  ~ the License.  You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
+<!-- ~ Licensed to the Apache Software Foundation (ASF) under one or more 
+	~ contributor license agreements. See the NOTICE file distributed with ~ 
+	this work for additional information regarding copyright ownership. ~ The 
+	ASF licenses this file to You under the Apache License, Version 2.0 ~ (the 
+	"License"); you may not use this file except in compliance with ~ the License. 
+	You may obtain a copy of the License at ~ ~ http://www.apache.org/licenses/LICENSE-2.0 
+	~ ~ Unless required by applicable law or agreed to in writing, software ~ 
+	distributed under the License is distributed on an "AS IS" BASIS, ~ WITHOUT 
+	WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ~ See the 
+	License for the specific language governing permissions and ~ limitations 
+	under the License. -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -199,9 +194,9 @@
 					<groupId>commons-net</groupId>
 				</exclusion>
 				<exclusion>
-                  <groupId>org.apache.hive</groupId>
-                  <artifactId>hive-service</artifactId>
-              	</exclusion>
+					<groupId>org.apache.hive</groupId>
+					<artifactId>hive-service</artifactId>
+				</exclusion>
 				<exclusion>
 					<groupId>org.slf4j</groupId>
 					<artifactId>slf4j-log4j12</artifactId>
@@ -406,14 +401,20 @@
 								<minimizeJar>true</minimizeJar>
 								<transformers>
 									<transformer
-											implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+										implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
 									</transformer>
 									<transformer
-											implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer">
+										implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer">
 									</transformer>
 								</transformers>
 								<filters>
 									<filter>
+										<artifact>org.tachyonproject:*</artifact>
+										<includes>
+											<include>org/tachyonproject/**</include>
+										</includes>
+									</filter>
+									<filter>
 										<artifact>*:*</artifact>
 										<excludes>
 											<exclude>META-INF/*.SF</exclude>
@@ -425,13 +426,13 @@
 							</configuration>
 						</execution>
 
-						<!-- in the version with benchmarks (pom-with-benchmarks.xml), this
+						<!-- in the version with benchmarks (pom-with-benchmarks.xml), this 
 							is where that <execution></execution> lives -->
 
 					</executions>
 				</plugin>
 
-				<!--This plugin's configuration is used to store Eclipse m2e settings
+				<!--This plugin's configuration is used to store Eclipse m2e settings 
 					only. It has no influence on the Maven build itself. -->
 				<plugin>
 					<groupId>org.eclipse.m2e</groupId>
@@ -456,27 +457,27 @@
 										</goals>
 									</pluginExecutionFilter>
 									<action>
-										<ignore/>
+										<ignore />
 									</action>
 								</pluginExecution>
 								<pluginExecution>
-								    <pluginExecutionFilter>
-								        <groupId>
-								            org.apache.rat
-								        </groupId>
-								        <artifactId>
-								            apache-rat-plugin
-								        </artifactId>
-								        <versionRange>
-								            [0.11,)
-								        </versionRange>
-								        <goals>
-								            <goal>check</goal>
-								        </goals>
-								    </pluginExecutionFilter>
-								    <action>
-								        <ignore/>
-								    </action>
+									<pluginExecutionFilter>
+										<groupId>
+											org.apache.rat
+										</groupId>
+										<artifactId>
+											apache-rat-plugin
+										</artifactId>
+										<versionRange>
+											[0.11,)
+										</versionRange>
+										<goals>
+											<goal>check</goal>
+										</goals>
+									</pluginExecutionFilter>
+									<action>
+										<ignore />
+									</action>
 								</pluginExecution>
 							</pluginExecutions>
 						</lifecycleMappingMetadata>
@@ -526,12 +527,13 @@
 
 	<profiles>
 		<profile>
-			<!-- Performs execution of Integration Tests using the Maven FailSafe Plugin. The view
of integration tests in this context
-			are those tests interfacing with external sources and services requiring additional resources
or credentials that cannot
-			be explicitly provided. -->
+			<!-- Performs execution of Integration Tests using the Maven FailSafe 
+				Plugin. The view of integration tests in this context are those tests interfacing 
+				with external sources and services requiring additional resources or credentials 
+				that cannot be explicitly provided. -->
 			<id>integration-tests</id>
 			<build>
-			<plugins>
+				<plugins>
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-failsafe-plugin</artifactId>
@@ -548,12 +550,12 @@
 			</build>
 		</profile>
 		<profile>
-			<!-- Checks style and licensing requirements. This is a good idea to run
-			for contributions and for the release process. While it would be nice to
-			run always these plugins can considerably slow the build and have proven
-			to create unstable builds in our multi-module project and when building using
-			multiple threads. The stability issues seen with Checkstyle in multi-module
-			builds include false-positives and false negatives. -->
+			<!-- Checks style and licensing requirements. This is a good idea to run 
+				for contributions and for the release process. While it would be nice to 
+				run always these plugins can considerably slow the build and have proven 
+				to create unstable builds in our multi-module project and when building using 
+				multiple threads. The stability issues seen with Checkstyle in multi-module 
+				builds include false-positives and false negatives. -->
 			<id>contrib-check</id>
 			<build>
 				<plugins>
@@ -585,12 +587,11 @@
 			</build>
 		</profile>
 		<profile>
-			<!-- This profile will disable DocLint which performs strict
-				JavaDoc processing which was introduced in JDK 8. These are technically errors
-				in the JavaDoc which we need to eventually address. However, if a release
-				is performed using JDK 8, the JavaDoc generation would fail. By activating
-				this profile when running on JDK 8 we can ensure the JavaDocs continue to
-				generate successfully -->
+			<!-- This profile will disable DocLint which performs strict JavaDoc processing 
+				which was introduced in JDK 8. These are technically errors in the JavaDoc 
+				which we need to eventually address. However, if a release is performed using 
+				JDK 8, the JavaDoc generation would fail. By activating this profile when 
+				running on JDK 8 we can ensure the JavaDocs continue to generate successfully -->
 			<id>disable-doclint</id>
 			<activation>
 				<jdk>1.8</jdk>

http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/27791ec1/src/main/java/org/apache/pirk/schema/data/DataSchemaLoader.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/pirk/schema/data/DataSchemaLoader.java b/src/main/java/org/apache/pirk/schema/data/DataSchemaLoader.java
index ecb54c0..bc93827 100644
--- a/src/main/java/org/apache/pirk/schema/data/DataSchemaLoader.java
+++ b/src/main/java/org/apache/pirk/schema/data/DataSchemaLoader.java
@@ -48,7 +48,8 @@ import org.xml.sax.SAXException;
  * <p>
  * Schemas should be specified as follows:
  *
- * <pre>{@code
+ * <pre>
+ * {@code
  * <schema>
  *    <schemaName> name of the schema </schemaName>
  *    <element>
@@ -88,12 +89,10 @@ public class DataSchemaLoader
     }
   }
 
-
-
   /* Kept for compatibility */
   /**
-   * Initializes the static {@link DataSchemaRegistry} with a list of
-   * available data schema names.
+   * Initializes the static {@link DataSchemaRegistry} with a list of available data schema
names.
+   * 
    * @throws Exception
    */
   public static void initialize() throws Exception
@@ -103,14 +102,12 @@ public class DataSchemaLoader
 
   /* Kept for compatibility */
   /**
-   * Initializes the static {@link DataSchemaRegistry} with a list of
-   * available data schema names.
+   * Initializes the static {@link DataSchemaRegistry} with a list of available data schema
names.
+   * 
    * @param hdfs
-   *          If true, specifies that the data schema is an hdfs file; if
-   *          false, that it is a regular file.
+   *          If true, specifies that the data schema is an hdfs file; if false, that it
is a regular file.
    * @param fs
-   *          Used only when {@code hdfs} is true; the {@link FileSystem}
-   *          handle for the hdfs in which the data schema exists
+   *          Used only when {@code hdfs} is true; the {@link FileSystem} handle for the
hdfs in which the data schema exists
    * @throws Exception
    */
   public static void initialize(boolean hdfs, FileSystem fs) throws Exception
@@ -173,9 +170,9 @@ public class DataSchemaLoader
    *          The source of the XML data schema description.
    * @return The data schema.
    * @throws IOException
-   *          A problem occurred reading from the given stream.
+   *           A problem occurred reading from the given stream.
    * @throws PIRException
-   *          The schema description is invalid.
+   *           The schema description is invalid.
    */
   public DataSchema loadSchema(InputStream stream) throws IOException, PIRException
   {
@@ -210,10 +207,10 @@ public class DataSchemaLoader
 
   /**
    * Parses and normalizes the XML document available on the given stream.
+   * 
    * @param stream
    *          The input stream.
-   * @return
-   *          A {@link Document} representing the XML document.
+   * @return A {@link Document} representing the XML document.
    * @throws IOException
    * @throws PIRException
    */
@@ -236,6 +233,7 @@ public class DataSchemaLoader
 
   /**
    * Extracts a data schema element node's contents
+   * 
    * @param eElement
    *          A data schema element node.
    * @param schema
@@ -312,8 +310,7 @@ public class DataSchemaLoader
    *
    * @param partitionerTypeName
    *          The name of the {@link DataPartitioner} subclass to instantiate.
-   * @return
-   *          An instance of the named {@link DataPartitioner} subclass.
+   * @return An instance of the named {@link DataPartitioner} subclass.
    * @throws PIRException
    */
   DataPartitioner instantiatePartitioner(String partitionerTypeName) throws PIRException

http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/27791ec1/src/main/java/org/apache/pirk/schema/query/QuerySchemaLoader.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/pirk/schema/query/QuerySchemaLoader.java b/src/main/java/org/apache/pirk/schema/query/QuerySchemaLoader.java
index dab0ecb..78e5bc7 100644
--- a/src/main/java/org/apache/pirk/schema/query/QuerySchemaLoader.java
+++ b/src/main/java/org/apache/pirk/schema/query/QuerySchemaLoader.java
@@ -52,7 +52,8 @@ import org.xml.sax.SAXException;
  * <p>
  * Schemas should be specified as follows:
  *
- * <pre>{@code
+ * <pre>
+ * {@code
  * <schema>
  *    <schemaName> name of the schema </schemaName>
  *    <dataSchemaName> name of the data schema over which this query is run </dataSchemaName>
@@ -93,8 +94,8 @@ public class QuerySchemaLoader
 
   /* Kept for compatibility */
   /**
-   * Initializes the static {@link QuerySchemaRegistry} with a list of
-   * query schema names.
+   * Initializes the static {@link QuerySchemaRegistry} with a list of query schema names.
+   * 
    * @throws Exception
    */
   public static void initialize() throws Exception
@@ -104,14 +105,12 @@ public class QuerySchemaLoader
 
   /* Kept for compatibility */
   /**
-   * Initializes the static {@link QuerySchemaRegistry} with a list of
-   * available query schema names.
+   * Initializes the static {@link QuerySchemaRegistry} with a list of available query schema
names.
+   * 
    * @param hdfs
-   *    If true, specifies that the query schema is an hdfs file; if false,
-   *    that it is a regular file.
+   *          If true, specifies that the query schema is an hdfs file; if false, that it
is a regular file.
    * @param fs
-   *    Used only when {@code hdfs} is true; the {@link FileSystem} handle
-   *    for the hdfs in which the query schema exists
+   *          Used only when {@code hdfs} is true; the {@link FileSystem} handle for the
hdfs in which the query schema exists
    * @throws Exception
    */
   public static void initialize(boolean hdfs, FileSystem fs) throws Exception
@@ -175,9 +174,9 @@ public class QuerySchemaLoader
    *          The source of the XML query schema description.
    * @return The query schema.
    * @throws IOException
-   *          A problem occurred reading from the given stream.
+   *           A problem occurred reading from the given stream.
    * @throws PIRException
-   *          The schema description is invalid.
+   *           The schema description is invalid.
    */
   public QuerySchema loadSchema(InputStream stream) throws IOException, PIRException
   {
@@ -267,6 +266,7 @@ public class QuerySchemaLoader
 
   /**
    * Parses and normalizes the XML document available on the given stream.
+   * 
    * @param stream
    *          The input stream.
    * @return A Document representing the XML document.
@@ -355,6 +355,7 @@ public class QuerySchemaLoader
    * Instantiate the specified filter.
    *
    * Exceptions derive from call to the {@code getFilter} method of {@link FilterFactory}
+   * 
    * @param filterTypeName
    *          The name of the filter class we are instantiating
    * @param filteredElementNames


Mime
View raw message