ATLAS-1210 patch file to add position attribute to hive_column type…

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());

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>

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)

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) {