[SPARK-13548][BUILD] Move tags and unsafe modules into common

## What changes were proposed in this pull request? This patch moves tags and unsafe modules into common directory to remove 2 top level non-user-facing directories. ## How was this patch tested? Jenkins should suffice. Author: Reynold Xin <rxin@databricks.com> Closes #11426 from rxin/SPARK-13548.
apache · Mar 1, 2016 · b0ee7d4 · b0ee7d4
1 parent c27ba0d
commit b0ee7d4
Show file tree

Hide file tree

Showing 27 changed files with 4 additions and 4 deletions.
diff --git a/tags/README.md → common/tags/README.md b/tags/README.md → common/tags/README.md
diff --git a/tags/pom.xml → common/tags/pom.xml b/tags/pom.xml → common/tags/pom.xml
@@ -23,7 +23,7 @@
     <groupId>org.apache.spark</groupId>
     <artifactId>spark-parent_2.11</artifactId>
     <version>2.0.0-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
 
   <groupId>org.apache.spark</groupId>

diff --git a/...ava/org/apache/spark/tags/DockerTest.java → ...ava/org/apache/spark/tags/DockerTest.java b/...ava/org/apache/spark/tags/DockerTest.java → ...ava/org/apache/spark/tags/DockerTest.java
diff --git a/...g/apache/spark/tags/ExtendedHiveTest.java → ...g/apache/spark/tags/ExtendedHiveTest.java b/...g/apache/spark/tags/ExtendedHiveTest.java → ...g/apache/spark/tags/ExtendedHiveTest.java
diff --git a/...g/apache/spark/tags/ExtendedYarnTest.java → ...g/apache/spark/tags/ExtendedYarnTest.java b/...g/apache/spark/tags/ExtendedYarnTest.java → ...g/apache/spark/tags/ExtendedYarnTest.java
diff --git a/unsafe/pom.xml → common/unsafe/pom.xml b/unsafe/pom.xml → common/unsafe/pom.xml
@@ -23,7 +23,7 @@
     <groupId>org.apache.spark</groupId>
     <artifactId>spark-parent_2.11</artifactId>
     <version>2.0.0-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
 
   <groupId>org.apache.spark</groupId>

diff --git a/...a/org/apache/spark/unsafe/KVIterator.java → ...a/org/apache/spark/unsafe/KVIterator.java b/...a/org/apache/spark/unsafe/KVIterator.java → ...a/org/apache/spark/unsafe/KVIterator.java
diff --git a/...ava/org/apache/spark/unsafe/Platform.java → ...ava/org/apache/spark/unsafe/Platform.java b/...ava/org/apache/spark/unsafe/Platform.java → ...ava/org/apache/spark/unsafe/Platform.java
diff --git a/.../spark/unsafe/array/ByteArrayMethods.java → .../spark/unsafe/array/ByteArrayMethods.java b/.../spark/unsafe/array/ByteArrayMethods.java → .../spark/unsafe/array/ByteArrayMethods.java
diff --git a/.../apache/spark/unsafe/array/LongArray.java → .../apache/spark/unsafe/array/LongArray.java b/.../apache/spark/unsafe/array/LongArray.java → .../apache/spark/unsafe/array/LongArray.java
diff --git a/...he/spark/unsafe/bitset/BitSetMethods.java → ...he/spark/unsafe/bitset/BitSetMethods.java b/...he/spark/unsafe/bitset/BitSetMethods.java → ...he/spark/unsafe/bitset/BitSetMethods.java
diff --git a/...che/spark/unsafe/hash/Murmur3_x86_32.java → ...che/spark/unsafe/hash/Murmur3_x86_32.java b/...che/spark/unsafe/hash/Murmur3_x86_32.java → ...che/spark/unsafe/hash/Murmur3_x86_32.java
diff --git a/...rk/unsafe/memory/HeapMemoryAllocator.java → ...rk/unsafe/memory/HeapMemoryAllocator.java b/...rk/unsafe/memory/HeapMemoryAllocator.java → ...rk/unsafe/memory/HeapMemoryAllocator.java
diff --git a/.../spark/unsafe/memory/MemoryAllocator.java → .../spark/unsafe/memory/MemoryAllocator.java b/.../spark/unsafe/memory/MemoryAllocator.java → .../spark/unsafe/memory/MemoryAllocator.java
diff --git a/...ache/spark/unsafe/memory/MemoryBlock.java → ...ache/spark/unsafe/memory/MemoryBlock.java b/...ache/spark/unsafe/memory/MemoryBlock.java → ...ache/spark/unsafe/memory/MemoryBlock.java
diff --git a/...e/spark/unsafe/memory/MemoryLocation.java → ...e/spark/unsafe/memory/MemoryLocation.java b/...e/spark/unsafe/memory/MemoryLocation.java → ...e/spark/unsafe/memory/MemoryLocation.java
diff --git a/.../unsafe/memory/UnsafeMemoryAllocator.java → .../unsafe/memory/UnsafeMemoryAllocator.java b/.../unsafe/memory/UnsafeMemoryAllocator.java → .../unsafe/memory/UnsafeMemoryAllocator.java
diff --git a/.../apache/spark/unsafe/types/ByteArray.java → .../apache/spark/unsafe/types/ByteArray.java b/.../apache/spark/unsafe/types/ByteArray.java → .../apache/spark/unsafe/types/ByteArray.java
diff --git a/.../spark/unsafe/types/CalendarInterval.java → .../spark/unsafe/types/CalendarInterval.java b/.../spark/unsafe/types/CalendarInterval.java → .../spark/unsafe/types/CalendarInterval.java
diff --git a/...apache/spark/unsafe/types/UTF8String.java → ...apache/spark/unsafe/types/UTF8String.java b/...apache/spark/unsafe/types/UTF8String.java → ...apache/spark/unsafe/types/UTF8String.java
diff --git a/...pache/spark/unsafe/PlatformUtilSuite.java → ...pache/spark/unsafe/PlatformUtilSuite.java b/...pache/spark/unsafe/PlatformUtilSuite.java → ...pache/spark/unsafe/PlatformUtilSuite.java
diff --git a/...he/spark/unsafe/array/LongArraySuite.java → ...he/spark/unsafe/array/LongArraySuite.java b/...he/spark/unsafe/array/LongArraySuite.java → ...he/spark/unsafe/array/LongArraySuite.java
diff --git a/...park/unsafe/hash/Murmur3_x86_32Suite.java → ...park/unsafe/hash/Murmur3_x86_32Suite.java b/...park/unsafe/hash/Murmur3_x86_32Suite.java → ...park/unsafe/hash/Murmur3_x86_32Suite.java
diff --git a/...k/unsafe/types/CalendarIntervalSuite.java → ...k/unsafe/types/CalendarIntervalSuite.java b/...k/unsafe/types/CalendarIntervalSuite.java → ...k/unsafe/types/CalendarIntervalSuite.java
diff --git a/...e/spark/unsafe/types/UTF8StringSuite.java → ...e/spark/unsafe/types/UTF8StringSuite.java b/...e/spark/unsafe/types/UTF8StringSuite.java → ...e/spark/unsafe/types/UTF8StringSuite.java
diff --git a/.../types/UTF8StringPropertyCheckSuite.scala → .../types/UTF8StringPropertyCheckSuite.scala b/.../types/UTF8StringPropertyCheckSuite.scala → .../types/UTF8StringPropertyCheckSuite.scala
diff --git a/pom.xml b/pom.xml
@@ -89,7 +89,8 @@
     <module>common/sketch</module>
     <module>common/network-common</module>
     <module>common/network-shuffle</module>
-    <module>tags</module>
+    <module>common/unsafe</module>
+    <module>common/tags</module>
     <module>core</module>
     <module>graphx</module>
     <module>mllib</module>
@@ -99,7 +100,6 @@
     <module>sql/core</module>
     <module>sql/hive</module>
     <module>docker-integration-tests</module>
-    <module>unsafe</module>
     <module>assembly</module>
     <module>external/twitter</module>
     <module>external/flume</module>