Prefixed property keys for internal keys to avoid collision

client/src/main/java/org/apache/hadoop/metadata/MetadataServiceClient.java

@@ -50,6 +50,9 @@ public class MetadataServiceClient {
     private static final Logger LOG = LoggerFactory.getLogger(MetadataServiceClient.class);
     public static final String NAME = "name";
     public static final String GUID = "GUID";
+    public static final String TYPENAME = "typeName";
+
+
     public static final String DEFINITION = "definition";
     public static final String ERROR = "error";
     public static final String REQUEST_ID = "requestId";

repository/src/main/java/org/apache/hadoop/metadata/discovery/graph/GraphBackedDiscoveryService.java

@@ -23,6 +23,7 @@ import com.thinkaurelius.titan.core.TitanIndexQuery;
 import com.thinkaurelius.titan.core.TitanProperty;
 import com.thinkaurelius.titan.core.TitanVertex;
 import com.tinkerpop.blueprints.Vertex;
+import org.apache.hadoop.metadata.MetadataServiceClient;
 import org.apache.hadoop.metadata.discovery.DiscoveryException;
 import org.apache.hadoop.metadata.discovery.DiscoveryService;
 import org.apache.hadoop.metadata.query.Expressions;
@@ -66,6 +67,8 @@ public class GraphBackedDiscoveryService implements DiscoveryService {
     private final TitanGraph titanGraph;
     private final DefaultGraphPersistenceStrategy graphPersistenceStrategy;
 
+    public final static String SCORE = "score";
+
     @Inject
     GraphBackedDiscoveryService(GraphProvider<TitanGraph> graphProvider,
                                 MetadataRepository metadataRepository) throws DiscoveryException {
@@ -92,9 +95,9 @@ public class GraphBackedDiscoveryService implements DiscoveryService {
             String guid = vertex.getProperty(Constants.GUID_PROPERTY_KEY);
             if (guid != null) { //Filter non-class entities
                 try {
-                    row.put("guid", guid);
-                    row.put("typeName", vertex.<String>getProperty(Constants.ENTITY_TYPE_PROPERTY_KEY));
-                    row.put("score", result.getScore());
+                    row.put(MetadataServiceClient.GUID, guid);
+                    row.put(MetadataServiceClient.TYPENAME, vertex.<String>getProperty(Constants.ENTITY_TYPE_PROPERTY_KEY));
+                    row.put(SCORE, result.getScore());
                 } catch (JSONException e) {
                     LOG.error("Unable to create response", e);
                     throw new DiscoveryException("Unable to create response");

repository/src/main/java/org/apache/hadoop/metadata/repository/Constants.java

@@ -23,41 +23,44 @@ public final class Constants {
     /**
      * Globally Unique identifier property key.
      */
-    public static final String GUID_PROPERTY_KEY = "guid";
+    
+    public static final String INTERNAL_PROPERTY_KEY_PREFIX = "__";
+    public static final String GUID_PROPERTY_KEY = INTERNAL_PROPERTY_KEY_PREFIX + "guid";
     public static final String GUID_INDEX = "guid_index";
 
     /**
      * Entity type name property key.
      */
-    public static final String ENTITY_TYPE_PROPERTY_KEY = "typeName";
+    public static final String ENTITY_TYPE_PROPERTY_KEY = INTERNAL_PROPERTY_KEY_PREFIX + "typeName";
     public static final String ENTITY_TYPE_INDEX = "type_index";
 
     /**
      * Entity type's super types property key.
      */
-    public static final String SUPER_TYPES_PROPERTY_KEY = "superTypeNames";
+    public static final String SUPER_TYPES_PROPERTY_KEY = INTERNAL_PROPERTY_KEY_PREFIX + "superTypeNames";
     public static final String SUPER_TYPES_INDEX = "super_types_index";
 
     /**
      * Full-text for the entity for enabling full-text search.
      */
+    //weird issue in TitanDB if __ added to this property key. Not adding it for now
     public static final String ENTITY_TEXT_PROPERTY_KEY = "entityText";
 
     /**
      * Properties for type store graph
      */
-    public static final String TYPE_CATEGORY_PROPERTY_KEY = "type.category";
-    public static final String VERTEX_TYPE_PROPERTY_KEY = "type";
-    public static final String TYPENAME_PROPERTY_KEY = "type.name";
+    public static final String TYPE_CATEGORY_PROPERTY_KEY = INTERNAL_PROPERTY_KEY_PREFIX + "type.category";
+    public static final String VERTEX_TYPE_PROPERTY_KEY = INTERNAL_PROPERTY_KEY_PREFIX + "type";
+    public static final String TYPENAME_PROPERTY_KEY = INTERNAL_PROPERTY_KEY_PREFIX + "type.name";
 
     /**
      * Trait names property key and index name.
      */
-    public static final String TRAIT_NAMES_PROPERTY_KEY = "traitNames";
+    public static final String TRAIT_NAMES_PROPERTY_KEY = INTERNAL_PROPERTY_KEY_PREFIX + "traitNames";
     public static final String TRAIT_NAMES_INDEX = "trait_names_index";
 
-    public static final String VERSION_PROPERTY_KEY = "version";
-    public static final String TIMESTAMP_PROPERTY_KEY = "timestamp";
+    public static final String VERSION_PROPERTY_KEY = INTERNAL_PROPERTY_KEY_PREFIX + "version";
+    public static final String TIMESTAMP_PROPERTY_KEY = INTERNAL_PROPERTY_KEY_PREFIX + "timestamp";
 
     /**
      * search backing index name.

typesystem/src/main/java/org/apache/hadoop/metadata/typesystem/types/TypeSystem.java

@@ -627,13 +627,13 @@ public class TypeSystem {
     }
 
     public class IdType {
-        private static final String ID_ATTRNAME = "guid";
-        private static final String  TYPENAME_ATTRNAME = "typeName";
+        private static final String ID_ATTRNAME = "__guid";
+        private static final String  TYPENAME_ATTRNAME = "__typeName";
         private static final String  TYP_NAME = "__IdType";
 
         private IdType() {
             AttributeDefinition idAttr = new AttributeDefinition(ID_ATTRNAME,
-                    DataTypes.STRING_TYPE.getName(), Multiplicity.REQUIRED, false, null);
+                    DataTypes.STRING_TYPE.getName(), Multiplicity.REQUIRED, true, true, false, null);
             AttributeDefinition typNmAttr =
                     new AttributeDefinition(TYPENAME_ATTRNAME,
                             DataTypes.STRING_TYPE.getName(), Multiplicity.REQUIRED, false, null);