atlas-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From suma...@apache.org
Subject incubator-atlas git commit: ATLAS-1210 patch file to add position attribute to hive_column type (sarath.kum4r@gmail.com via sumasai)
Date Tue, 11 Oct 2016 21:15:14 GMT
Repository: incubator-atlas
Updated Branches:
  refs/heads/master d2d6ff7d1 -> 0d01f356c


ATLAS-1210 patch file to add position attribute to hive_column type (sarath.kum4r@gmail.com
via sumasai)


Project: http://git-wip-us.apache.org/repos/asf/incubator-atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-atlas/commit/0d01f356
Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/0d01f356
Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/0d01f356

Branch: refs/heads/master
Commit: 0d01f356c93d4a06fb907a2de3401c4f11dd1d13
Parents: d2d6ff7
Author: Suma Shivaprasad <sumasai.shivaprasad@gmail.com>
Authored: Tue Oct 11 13:32:35 2016 -0700
Committer: Suma Shivaprasad <sumasai.shivaprasad@gmail.com>
Committed: Tue Oct 11 13:32:35 2016 -0700

----------------------------------------------------------------------
 .../org/apache/atlas/hive/model/HiveDataModelGenerator.java    | 2 +-
 .../hive-bridge/src/patches/001-hive_column_add_position.json  | 0
 distro/src/main/assemblies/standalone-package.xml              | 6 ++++++
 release-log.txt                                                | 1 +
 .../java/org/apache/atlas/services/ReservedTypesRegistrar.java | 6 ++++--
 5 files changed, 12 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/0d01f356/addons/hive-bridge/src/main/java/org/apache/atlas/hive/model/HiveDataModelGenerator.java
----------------------------------------------------------------------
diff --git a/addons/hive-bridge/src/main/java/org/apache/atlas/hive/model/HiveDataModelGenerator.java
b/addons/hive-bridge/src/main/java/org/apache/atlas/hive/model/HiveDataModelGenerator.java
index 28078f4..d0fc43f 100755
--- a/addons/hive-bridge/src/main/java/org/apache/atlas/hive/model/HiveDataModelGenerator.java
+++ b/addons/hive-bridge/src/main/java/org/apache/atlas/hive/model/HiveDataModelGenerator.java
@@ -229,7 +229,7 @@ public class HiveDataModelGenerator {
                 new AttributeDefinition(POSITION, DataTypes.INT_TYPE.getName(), Multiplicity.OPTIONAL,
false, false, false, null)};
 
         HierarchicalTypeDefinition<ClassType> definition =
-                new HierarchicalTypeDefinition<>(ClassType.class, HiveDataTypes.HIVE_COLUMN.getName(),
null,
+                new HierarchicalTypeDefinition<>(ClassType.class, HiveDataTypes.HIVE_COLUMN.getName(),
null, "1.1",
                     ImmutableSet.of(AtlasClient.DATA_SET_SUPER_TYPE), attributeDefinitions);
         classTypeDefinitions.put(HiveDataTypes.HIVE_COLUMN.getName(), definition);
         LOG.debug("Created definition for " + HiveDataTypes.HIVE_COLUMN.getName());

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/0d01f356/addons/hive-bridge/src/patches/001-hive_column_add_position.json
----------------------------------------------------------------------
diff --git a/addons/hive-bridge/src/patches/001-hive_column_add_position.json b/addons/hive-bridge/src/patches/001-hive_column_add_position.json
new file mode 100644
index 0000000..e69de29

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/0d01f356/distro/src/main/assemblies/standalone-package.xml
----------------------------------------------------------------------
diff --git a/distro/src/main/assemblies/standalone-package.xml b/distro/src/main/assemblies/standalone-package.xml
index 53b034f..39c6512 100755
--- a/distro/src/main/assemblies/standalone-package.xml
+++ b/distro/src/main/assemblies/standalone-package.xml
@@ -173,6 +173,12 @@
             <directory>../notification/target/dependency/hook</directory>
             <outputDirectory>hook</outputDirectory>
         </fileSet>
+
+        <!-- for patches -->
+        <fileSet>
+            <directory>../addons/hive-bridge/src/patches</directory>
+            <outputDirectory>models/patches</outputDirectory>
+        </fileSet>
     </fileSets>
 
     <files>

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/0d01f356/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index 494d147..a949dac 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -9,6 +9,7 @@ ATLAS-1060 Add composite indexes for exact match performance improvements
for al
 ATLAS-1127 Modify creation and modification timestamps to Date instead of Long(sumasai)
 
 ALL CHANGES:
+ATLAS-1210 patch file to add "position" attribute to hive_column type (sarath.kum4r@gmail.com
via sumasai)
 ATLAS-694  Update Atlas code to use graph abstraction layer (jnhagelb via sumasai)
 ATLAS-1215 Atlas UI not working in firefox due to fix in ATLAS-1199 (kevalbhatt)
 ATLAS-1171 Structured, high-level public APIs - Fix JAXB issues with PList, SearchFilter
(mneethiraj via sumasai)

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/0d01f356/repository/src/main/java/org/apache/atlas/services/ReservedTypesRegistrar.java
----------------------------------------------------------------------
diff --git a/repository/src/main/java/org/apache/atlas/services/ReservedTypesRegistrar.java
b/repository/src/main/java/org/apache/atlas/services/ReservedTypesRegistrar.java
index c269c3a..e0cabe9 100644
--- a/repository/src/main/java/org/apache/atlas/services/ReservedTypesRegistrar.java
+++ b/repository/src/main/java/org/apache/atlas/services/ReservedTypesRegistrar.java
@@ -65,8 +65,10 @@ public class ReservedTypesRegistrar implements IBootstrapTypesRegistrar
{
 
         for (File typeDefFile : typeDefFiles) {
             try {
-                String typeDefJSON = new String(Files.readAllBytes(typeDefFile.toPath()),
StandardCharsets.UTF_8);
-                registerType(typeSystem, metadataService, typeDefFile.getAbsolutePath(),
typeDefJSON);
+                if (typeDefFile.isFile()) {
+                    String typeDefJSON = new String(Files.readAllBytes(typeDefFile.toPath()),
StandardCharsets.UTF_8);
+                    registerType(typeSystem, metadataService, typeDefFile.getAbsolutePath(),
typeDefJSON);
+                }
             } catch (IOException e) {
                 LOG.error("error while registering types in file " + typeDefFile.getAbsolutePath(),
e);
             } catch (AtlasException e) {


Mime
View raw message