You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@metamodel.apache.org by ka...@apache.org on 2015/08/25 09:23:04 UTC
metamodel git commit: METAMODEL-177: Fixed
Repository: metamodel
Updated Branches:
refs/heads/master 226b004a4 -> 7cba3cb37
METAMODEL-177: Fixed
Fixes #46
Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/7cba3cb3
Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/7cba3cb3
Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/7cba3cb3
Branch: refs/heads/master
Commit: 7cba3cb377bb80055079fa0df8233dd0422e9b3b
Parents: 226b004
Author: Kasper Sørensen <i....@gmail.com>
Authored: Tue Aug 25 09:12:39 2015 +0200
Committer: Kasper Sørensen <i....@gmail.com>
Committed: Tue Aug 25 09:12:39 2015 +0200
----------------------------------------------------------------------
CHANGES.md | 1 +
.../main/java/org/apache/metamodel/util/HdfsResource.java | 2 +-
.../java/org/apache/metamodel/util/HdfsResourceTest.java | 9 +++++++++
pom.xml | 7 ++++---
4 files changed, 15 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/metamodel/blob/7cba3cb3/CHANGES.md
----------------------------------------------------------------------
diff --git a/CHANGES.md b/CHANGES.md
index d3e6141..e64f049 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -6,6 +6,7 @@
* [METAMODEL-178] - Added AggregateFunction and ScalarFunction interfaces. Changed FunctionType enum to be super-interface of those. Compatibility is retained but a recompile of code using FunctionType is needed.
* [METAMODEL-179] - Ensured that HdfsResource is not closing a shared HDFS file system reference.
* [METAMODEL-171] - Made integration tests for Cassandra module function properly in all environments.
+ * [METAMODEL-177] - Fixed a bug pertaining to the serializability of HdfsResource.
### Apache MetaModel 4.3.6
http://git-wip-us.apache.org/repos/asf/metamodel/blob/7cba3cb3/hadoop/src/main/java/org/apache/metamodel/util/HdfsResource.java
----------------------------------------------------------------------
diff --git a/hadoop/src/main/java/org/apache/metamodel/util/HdfsResource.java b/hadoop/src/main/java/org/apache/metamodel/util/HdfsResource.java
index e9106ba..5d273df 100644
--- a/hadoop/src/main/java/org/apache/metamodel/util/HdfsResource.java
+++ b/hadoop/src/main/java/org/apache/metamodel/util/HdfsResource.java
@@ -184,7 +184,7 @@ public class HdfsResource extends AbstractResource implements Serializable {
private final String _hostname;
private final int _port;
private final String _filepath;
- private Path _path;
+ private transient Path _path;
/**
* Creates a {@link HdfsResource}
http://git-wip-us.apache.org/repos/asf/metamodel/blob/7cba3cb3/hadoop/src/test/java/org/apache/metamodel/util/HdfsResourceTest.java
----------------------------------------------------------------------
diff --git a/hadoop/src/test/java/org/apache/metamodel/util/HdfsResourceTest.java b/hadoop/src/test/java/org/apache/metamodel/util/HdfsResourceTest.java
index eace552..c6004d3 100644
--- a/hadoop/src/test/java/org/apache/metamodel/util/HdfsResourceTest.java
+++ b/hadoop/src/test/java/org/apache/metamodel/util/HdfsResourceTest.java
@@ -18,6 +18,8 @@
*/
package org.apache.metamodel.util;
+import org.apache.commons.lang.SerializationUtils;
+
import junit.framework.TestCase;
public class HdfsResourceTest extends TestCase {
@@ -39,4 +41,11 @@ public class HdfsResourceTest extends TestCase {
assertFalse(res3.equals(res1));
}
+
+ public void testSerialization() throws Exception {
+ final HdfsResource res1 = new HdfsResource("hdfs://localhost:9000/home/metamodel.txt");
+ final byte[] bytes = SerializationUtils.serialize(res1);
+ final Object res2 = SerializationUtils.deserialize(bytes);
+ assertEquals(res1, res2);
+ }
}
http://git-wip-us.apache.org/repos/asf/metamodel/blob/7cba3cb3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index bf40e05..86273ab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,6 +27,7 @@ under the License.
<junit.version>4.11</junit.version>
<guava.version>16.0.1</guava.version>
<hadoop.version>2.6.0</hadoop.version>
+ <jackson.version>2.4.6</jackson.version>
<easymock.version>3.2</easymock.version>
<httpcomponents.version>4.3.1</httpcomponents.version>
<checksum-maven-plugin.version>1.2</checksum-maven-plugin.version>
@@ -470,17 +471,17 @@ under the License.
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
- <version>2.4.1.1</version>
+ <version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>2.4.1.3</version>
+ <version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
- <version>2.4.1</version>
+ <version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>hsqldb</groupId>