From e643d510db9a4376a1e5341825225406eb28e0ba Mon Sep 17 00:00:00 2001 From: Venkatesh Seetharam <venkatesh@apache.org> Date: Wed, 3 Jun 2015 14:26:44 -0700 Subject: [PATCH] BUG-38663 start and end times for a hive process instance have -ve numbers --- addons/hive-bridge/src/main/java/org/apache/hadoop/metadata/hive/model/HiveDataModelGenerator.java | 20 ++++++++++---------- client/src/main/java/org/apache/hadoop/metadata/MetadataServiceClient.java | 1 - 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/addons/hive-bridge/src/main/java/org/apache/hadoop/metadata/hive/model/HiveDataModelGenerator.java b/addons/hive-bridge/src/main/java/org/apache/hadoop/metadata/hive/model/HiveDataModelGenerator.java index 6179b0b..5680c5f 100755 --- a/addons/hive-bridge/src/main/java/org/apache/hadoop/metadata/hive/model/HiveDataModelGenerator.java +++ b/addons/hive-bridge/src/main/java/org/apache/hadoop/metadata/hive/model/HiveDataModelGenerator.java @@ -351,9 +351,9 @@ public class HiveDataModelGenerator { Multiplicity.REQUIRED, false, null), new AttributeDefinition("tableName", HiveDataTypes.HIVE_TABLE.getName(), Multiplicity.REQUIRED, false, null), - new AttributeDefinition("createTime", DataTypes.INT_TYPE.getName(), + new AttributeDefinition("createTime", DataTypes.LONG_TYPE.getName(), Multiplicity.OPTIONAL, false, null), - new AttributeDefinition("lastAccessTime", DataTypes.INT_TYPE.getName(), + new AttributeDefinition("lastAccessTime", DataTypes.LONG_TYPE.getName(), Multiplicity.OPTIONAL, false, null), new AttributeDefinition("sd", HiveDataTypes.HIVE_STORAGEDESC.getName(), Multiplicity.REQUIRED, false, null), @@ -376,9 +376,9 @@ public class HiveDataModelGenerator { Multiplicity.REQUIRED, false, null), new AttributeDefinition("owner", DataTypes.STRING_TYPE.getName(), Multiplicity.OPTIONAL, false, null), - new AttributeDefinition("createTime", DataTypes.INT_TYPE.getName(), + new AttributeDefinition("createTime", DataTypes.LONG_TYPE.getName(), Multiplicity.OPTIONAL, false, null), - new AttributeDefinition("lastAccessTime", DataTypes.INT_TYPE.getName(), + new AttributeDefinition("lastAccessTime", DataTypes.LONG_TYPE.getName(), Multiplicity.OPTIONAL, false, null), new AttributeDefinition(COMMENT, DataTypes.STRING_TYPE.getName(), Multiplicity.OPTIONAL, false, null), @@ -418,9 +418,9 @@ public class HiveDataModelGenerator { Multiplicity.REQUIRED, false, null), new AttributeDefinition("dbName", HiveDataTypes.HIVE_DB.getName(), Multiplicity.REQUIRED, false, null), - new AttributeDefinition("createTime", DataTypes.INT_TYPE.getName(), + new AttributeDefinition("createTime", DataTypes.LONG_TYPE.getName(), Multiplicity.OPTIONAL, false, null), - new AttributeDefinition("lastAccessTime", DataTypes.INT_TYPE.getName(), + new AttributeDefinition("lastAccessTime", DataTypes.LONG_TYPE.getName(), Multiplicity.OPTIONAL, false, null), new AttributeDefinition("origTableName", HiveDataTypes.HIVE_TABLE.getName(), Multiplicity.REQUIRED, false, null), @@ -453,7 +453,7 @@ public class HiveDataModelGenerator { Multiplicity.OPTIONAL, false, null), new AttributeDefinition("ownerType", HiveDataTypes.HIVE_PRINCIPAL_TYPE.getName(), Multiplicity.REQUIRED, false, null), - new AttributeDefinition("createTime", DataTypes.INT_TYPE.getName(), + new AttributeDefinition("createTime", DataTypes.LONG_TYPE.getName(), Multiplicity.REQUIRED, false, null), new AttributeDefinition("functionType", HiveDataTypes.HIVE_FUNCTION_TYPE.getName(), Multiplicity.REQUIRED, false, null), @@ -472,7 +472,7 @@ public class HiveDataModelGenerator { AttributeDefinition[] attributeDefinitions = new AttributeDefinition[]{ new AttributeDefinition("roleName", DataTypes.STRING_TYPE.getName(), Multiplicity.REQUIRED, false, null), - new AttributeDefinition("createTime", DataTypes.INT_TYPE.getName(), + new AttributeDefinition("createTime", DataTypes.LONG_TYPE.getName(), Multiplicity.REQUIRED, false, null), new AttributeDefinition("ownerName", DataTypes.STRING_TYPE.getName(), Multiplicity.REQUIRED, false, null), @@ -486,9 +486,9 @@ public class HiveDataModelGenerator { private void createProcessClass() throws MetadataException { AttributeDefinition[] attributeDefinitions = new AttributeDefinition[]{ - new AttributeDefinition("startTime", DataTypes.INT_TYPE.getName(), + new AttributeDefinition("startTime", DataTypes.LONG_TYPE.getName(), Multiplicity.REQUIRED, false, null), - new AttributeDefinition("endTime", DataTypes.INT_TYPE.getName(), + new AttributeDefinition("endTime", DataTypes.LONG_TYPE.getName(), Multiplicity.REQUIRED, false, null), new AttributeDefinition("userName", DataTypes.STRING_TYPE.getName(), Multiplicity.REQUIRED, false, null), diff --git a/client/src/main/java/org/apache/hadoop/metadata/MetadataServiceClient.java b/client/src/main/java/org/apache/hadoop/metadata/MetadataServiceClient.java index 938fc55..1ff5c38 100755 --- a/client/src/main/java/org/apache/hadoop/metadata/MetadataServiceClient.java +++ b/client/src/main/java/org/apache/hadoop/metadata/MetadataServiceClient.java @@ -50,7 +50,6 @@ public class MetadataServiceClient { public static final String NAME = "name"; public static final String GUID = "GUID"; public static final String TYPENAME = "typeName"; - public static final String TYPE = "type"; public static final String DEFINITION = "definition"; public static final String ERROR = "error"; -- libgit2 0.27.1