You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@atlas.apache.org by sh...@apache.org on 2015/09/29 07:28:34 UTC
incubator-atlas git commit: ATLAS-134 Some defects found when
reviewing the source code (ltfxyz via shwethags)
Repository: incubator-atlas
Updated Branches:
refs/heads/master 9828c973b -> 983e5baab
ATLAS-134 Some defects found when reviewing the source code (ltfxyz via shwethags)
Project: http://git-wip-us.apache.org/repos/asf/incubator-atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-atlas/commit/983e5baa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/983e5baa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/983e5baa
Branch: refs/heads/master
Commit: 983e5baab2d893f6219b9aceefc0bf62fb02e83f
Parents: 9828c97
Author: Shwetha GS <ss...@hortonworks.com>
Authored: Tue Sep 29 10:58:28 2015 +0530
Committer: Shwetha GS <ss...@hortonworks.com>
Committed: Tue Sep 29 10:58:28 2015 +0530
----------------------------------------------------------------------
distro/src/test/python/scripts/TestMetadata.py | 6 +++---
release-log.txt | 1 +
.../org/apache/atlas/repository/memory/AttributeStores.java | 2 +-
.../apache/atlas/typesystem/types/ObjectGraphTraversal.java | 2 +-
.../org/apache/atlas/typesystem/types/ObjectGraphWalker.java | 2 +-
5 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/983e5baa/distro/src/test/python/scripts/TestMetadata.py
----------------------------------------------------------------------
diff --git a/distro/src/test/python/scripts/TestMetadata.py b/distro/src/test/python/scripts/TestMetadata.py
index 02eb938..e990068 100644
--- a/distro/src/test/python/scripts/TestMetadata.py
+++ b/distro/src/test/python/scripts/TestMetadata.py
@@ -49,9 +49,9 @@ class TestMetadata(unittest.TestCase):
if IS_WINDOWS:
java_mock.assert_called_with(
'org.apache.atlas.Main',
- ['-app', 'metadata_home/server/webapp/atlas'],
- 'metadata_home/conf:metadata_home/server/webapp/atlas/WEB-INF/classes:metadata_home/server/webapp/atlas/WEB-INF/lib\\*:metadata_home/libext\\*',
- ['-Datlas.log.dir=metadata_home/logs', '-Datlas.log.file=application.log', '-Datlas.home=metadata_home', '-Datlas.conf=metadata_home/conf', '-Xmx1024m', '-XX:MaxPermSize=512m', '-Dlog4j.configuration=atlas-log4j.xml'], 'metadata_home/logs')
+ ['-app', 'metadata_home\\server\\webapp\\atlas'],
+ 'metadata_home\\conf:metadata_home\\server\\webapp\\atlas\\WEB-INF\\classes:metadata_home\\server\\webapp\\atlas\\WEB-INF\\lib\\*:metadata_home\\libext\\*',
+ ['-Datlas.log.dir=metadata_home\\logs', '-Datlas.log.file=application.log', '-Datlas.home=metadata_home', '-Datlas.conf=metadata_home\\conf', '-Xmx1024m', '-XX:MaxPermSize=512m', '-Dlog4j.configuration=atlas-log4j.xml'], 'metadata_home\\logs')
else:
java_mock.assert_called_with(
'org.apache.atlas.Main',
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/983e5baa/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index e958a76..9edad87 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -9,6 +9,7 @@ ATLAS-54 Rename configs in hive hook (shwethags)
ATLAS-3 Mixed Index creation fails with Date types (suma.shivaprasad via shwethags)
ALL CHANGES:
+ATLAS-134 Some defects found when reviewing the source code (ltfxyz via shwethags)
ATLAS-196 Fix solr documentation (suma.shivaprasad via shwethags)
ATLAS-195 Document Hbase configs (suma.shivaprasad via shwethags)
ATLAS-102 Issue with SolrIndex (suma.shivaprasad via shwethags)
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/983e5baa/repository/src/main/java/org/apache/atlas/repository/memory/AttributeStores.java
----------------------------------------------------------------------
diff --git a/repository/src/main/java/org/apache/atlas/repository/memory/AttributeStores.java b/repository/src/main/java/org/apache/atlas/repository/memory/AttributeStores.java
index 2a6969b..a0cbb62 100755
--- a/repository/src/main/java/org/apache/atlas/repository/memory/AttributeStores.java
+++ b/repository/src/main/java/org/apache/atlas/repository/memory/AttributeStores.java
@@ -55,7 +55,7 @@ public class AttributeStores {
} else if (i.dataType() == DataTypes.BYTE_TYPE) {
return new ByteAttributeStore(i);
} else if (i.dataType() == DataTypes.SHORT_TYPE) {
- new ShortAttributeStore(i);
+ return new ShortAttributeStore(i);
} else if (i.dataType() == DataTypes.INT_TYPE) {
return new IntAttributeStore(i);
} else if (i.dataType() == DataTypes.LONG_TYPE) {
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/983e5baa/typesystem/src/main/java/org/apache/atlas/typesystem/types/ObjectGraphTraversal.java
----------------------------------------------------------------------
diff --git a/typesystem/src/main/java/org/apache/atlas/typesystem/types/ObjectGraphTraversal.java b/typesystem/src/main/java/org/apache/atlas/typesystem/types/ObjectGraphTraversal.java
index 8824e7b..5022aa6 100755
--- a/typesystem/src/main/java/org/apache/atlas/typesystem/types/ObjectGraphTraversal.java
+++ b/typesystem/src/main/java/org/apache/atlas/typesystem/types/ObjectGraphTraversal.java
@@ -53,7 +53,7 @@ public class ObjectGraphTraversal implements Iterator<ObjectGraphTraversal.Insta
processCollection(elemType, val);
} else if (dT.getTypeCategory() == DataTypes.TypeCategory.MAP) {
IDataType keyType = ((DataTypes.MapType) dT).getKeyType();
- IDataType valueType = ((DataTypes.MapType) dT).getKeyType();
+ IDataType valueType = ((DataTypes.MapType) dT).getValueType();
processMap(keyType, valueType, val);
} else if (dT.getTypeCategory() == DataTypes.TypeCategory.STRUCT
|| dT.getTypeCategory() == DataTypes.TypeCategory.TRAIT) {
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/983e5baa/typesystem/src/main/java/org/apache/atlas/typesystem/types/ObjectGraphWalker.java
----------------------------------------------------------------------
diff --git a/typesystem/src/main/java/org/apache/atlas/typesystem/types/ObjectGraphWalker.java b/typesystem/src/main/java/org/apache/atlas/typesystem/types/ObjectGraphWalker.java
index 5178a6b..fb4f79f 100755
--- a/typesystem/src/main/java/org/apache/atlas/typesystem/types/ObjectGraphWalker.java
+++ b/typesystem/src/main/java/org/apache/atlas/typesystem/types/ObjectGraphWalker.java
@@ -91,7 +91,7 @@ public class ObjectGraphWalker {
visitCollection(elemType, val);
} else if (dT.getTypeCategory() == DataTypes.TypeCategory.MAP) {
IDataType keyType = ((DataTypes.MapType) dT).getKeyType();
- IDataType valueType = ((DataTypes.MapType) dT).getKeyType();
+ IDataType valueType = ((DataTypes.MapType) dT).getValueType();
visitMap(keyType, valueType, val);
} else if (dT.getTypeCategory() == DataTypes.TypeCategory.STRUCT
|| dT.getTypeCategory() == DataTypes.TypeCategory.TRAIT) {