Completed DemoDataDriver & bootstrap-demo-data scripts.

src/bin/bootstrap-demo-data.sh

+#!/bin/bash
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License. See accompanying LICENSE file.
+#
+
+# resolve links - $0 may be a softlink
+PRG="${0}"
+
+while [ -h "${PRG}" ]; do
+  ls=`ls -ld "${PRG}"`
+  link=`expr "$ls" : '.*-> \(.*\)$'`
+  if expr "$link" : '/.*' > /dev/null; then
+    PRG="$link"
+  else
+    PRG=`dirname "${PRG}"`/"$link"
+  fi
+done
+
+BASEDIR=`dirname ${PRG}`
+BASEDIR=`cd ${BASEDIR}/..;pwd`
+
+if [ -z "$METADATA_CONF" ]; then
+  METADATA_CONF=${BASEDIR}/conf
+fi
+export METADATA_CONF
+
+if [ -f "${METADATA_CONF}/metadata-env.sh" ]; then
+  . "${METADATA_CONF}/metadata-env.sh"
+fi
+
+if test -z ${JAVA_HOME}
+then
+    JAVA_BIN=`which java`
+    JAR_BIN=`which jar`
+else
+    JAVA_BIN=${JAVA_HOME}/bin/java
+    JAR_BIN=${JAVA_HOME}/bin/jar
+fi
+export JAVA_BIN
+
+if [ ! -e $JAVA_BIN ] || [ ! -e $JAR_BIN ]; then
+  echo "$JAVA_BIN and/or $JAR_BIN not found on the system. Please make sure java and jar commands are available."
+  exit 1
+fi
+
+# default the heap size to 1GB
+DEFAULT_JAVA_HEAP_MAX=-Xmx1024m
+METADATA_OPTS="$DEFAULT_JAVA_HEAP_MAX $METADATA_OPTS"
+
+METADATACPPATH="$METADATA_CONF"
+
+METADATA_EXPANDED_WEBAPP_DIR=${METADATA_EXPANDED_WEBAPP_DIR:-${BASEDIR}/server/webapp}
+export METADATA_EXPANDED_WEBAPP_DIR
+
+METADATACPPATH="${METADATACPPATH}:${METADATA_EXPANDED_WEBAPP_DIR}/metadata/WEB-INF/classes"
+METADATACPPATH="${METADATACPPATH}:${METADATA_EXPANDED_WEBAPP_DIR}/metadata/WEB-INF/lib/*:${BASEDIR}/libext/*"
+
+# log and pid dirs for applications
+METADATA_LOG_DIR="${METADATA_LOG_DIR:-$BASEDIR/logs}"
+export METADATA_LOG_DIR
+
+METADATA_HOME_DIR="${METADATA_HOME_DIR:-$BASEDIR}"
+export METADATA_HOME_DIR
+
+JAVA_PROPERTIES="$METADATA_OPTS $METADATA_PROPERTIES -Dmetadata.log.dir=$METADATA_LOG_DIR -Dmetadata.home=${METADATA_HOME_DIR}"
+
+${JAVA_BIN} ${JAVA_PROPERTIES} -cp ${METADATACPPATH} org.apache.hadoop.metadata.DemoDataDriver
+
+echo Test data added to Metadata Server!!!

webapp/src/main/java/org/apache/hadoop/metadata/DemoDataDriver.java

@@ -171,7 +171,7 @@ public class DemoDataDriver {
 						Multiplicity.REQUIRED, true, null),
 				createRequiredAttrDef("success", DataTypes.STRING_TYPE),
 				createRequiredAttrDef("executionEngine", DataTypes.STRING_TYPE),
-				new AttributeDefinition("sourceTables", TABLE_TYPE,
+				new AttributeDefinition("sourceTables", DataTypes.arrayTypeName(TABLE_TYPE),
 						Multiplicity.COLLECTION, true, "forwardLineage"));
 
 		typeSystem.defineTypes(ImmutableList.of(structTypeDefinition),
@@ -181,12 +181,15 @@ public class DemoDataDriver {
 	}
 
 	private void submitTypes() throws Exception {
-		String typesAsJSON = TypesSerialization.toJson(
+		String tableTypesAsJSON = TypesSerialization.toJson(
 				typeSystem,
 				Arrays.asList(new String[] { DATABASE_TYPE, TABLE_TYPE,
-						"serdeType", "classification", "HiveLineage" }));
-		sumbitType(typesAsJSON, TABLE_TYPE);
-		sumbitType(typesAsJSON, "HiveLineage");
+						"serdeType", "classification"}));
+		String lineageTypesAsJSON = TypesSerialization.toJson(
+				typeSystem,
+				Arrays.asList(new String[] { "HiveLineage" }));
+		sumbitType(tableTypesAsJSON, TABLE_TYPE);
+		sumbitType(lineageTypesAsJSON, "HiveLineage");
 	}
 
 	private void sumbitType(String typesAsJSON, String type)
@@ -250,6 +253,7 @@ public class DemoDataDriver {
 		lineageInstance.set("user", user);
 		lineageInstance.set("queryStartTime", queryStartTime);
 		lineageInstance.set("queryEndTime", queryEndTime);
+		lineageInstance.set("query", query);
 		lineageInstance.set("success", success);
 		lineageInstance.set("executionEngine", executionEngine);
 
@@ -259,12 +263,13 @@ public class DemoDataDriver {
 				break;
 			}
 		}
-		ArrayList<Referenceable> sourceTablesRefArr = new ArrayList<Referenceable>();
+		ArrayList<ITypedReferenceableInstance> sourceTablesRefArr = new ArrayList<ITypedReferenceableInstance>();
 
 		for (String s : sourceTables.split(",")) {
+			System.out.println("search for table "+s);
 			for (ITypedReferenceableInstance table : tableArray) {
 				if (table.get("name").equals(s)) {
-
+					sourceTablesRefArr.add(table);
 				}
 			}
 		}
@@ -304,9 +309,9 @@ public class DemoDataDriver {
 			lineageArray.add(lineageInstance);
 		}
 
-		for (ITypedReferenceableInstance i : tableArray) {
+		/*for (ITypedReferenceableInstance i : tableArray) {
 			driver.submitEntity(i);
-		}
+		}*/
 		for (ITypedReferenceableInstance i : lineageArray) {
 			driver.submitEntity(i);
 		}
@@ -322,18 +327,18 @@ public class DemoDataDriver {
 						"Service User 02",
 						"1420563838114",
 						"1420563853806",
-						"CREATE TABLE providerCharges AS SELECT providerMasterList.*, ClaimPayments.* FROM  providerMasterList LEFT JOIN ClaimsPayment ON providerMasterList.providerID = claimsPayment.providerId  WHERE ClaimPaymets.paidStatus = \"true\";",
+						"CREATE TABLE providerCharges AS SELECT providerMasterList.*, claimPayments.* FROM  providerMasterList LEFT JOIN claimPayments ON providerMasterList.providerID = claimPayments.providerId  WHERE claimPayments.paidStatus = \"true\";",
 						"providerCharges", "true", "tez",
-						"providerMasterList,ClaimsPayments" },
+						"providerMasterList,claimPayments" },
 				{
 						"s123456_20150106120304_036125d5-a991-4dfc-9ff2-05b665c7e711",
 						"90797386-3933-4ab0-ae68-a7baa72435d4",
 						"Service User 02",
 						"1420563838314",
 						"1420563853906",
-						"CREATE TABLE providerComparativeModel AS SELECT providerCharges.*, LocationsOfThings.* FROM  providerCharges LEFT JOIN LocationOfThings ON providerCharges.providerName = LocationofThings.peopleName  WHERE LocationOfThings.isDr = \"true\";",
+						"CREATE TABLE providerComparativeModel AS SELECT providerCharges.*, LocationsOfThings.* FROM  providerCharges LEFT JOIN LocationsOfThings ON providerCharges.providerName = LocationsOfThings.peopleName  WHERE LocationsOfThings.isDr = \"true\";",
 						"providerComparativeModel", "true", "mapred",
-						"providerCharges,LocationOfThings" } };
+						"providerCharges,LocationsOfThings" } };
 	}
 
 	private static String[][] getTestTableData() {
@@ -344,7 +349,7 @@ public class DemoDataDriver {
 						"Providers Addresses and Locations of performed procedures",
 						"org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe",
 						"org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe" },
-				{ "charges_db", "ClaimPayments", "Claims paid",
+				{ "charges_db", "claimPayments", "Claims paid",
 						"org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe",
 						"org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe" },
 				{ "model_db", "providerCharges",