You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@impala.apache.org by mi...@apache.org on 2023/07/01 01:11:27 UTC

[impala] branch master updated (0c7f15e8b -> 87fd844d3)

This is an automated email from the ASF dual-hosted git repository.

michaelsmith pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/impala.git


    from 0c7f15e8b IMPALA-12248: Add three configuration properties after RANGER-2895
     new 5fe088f95 IMPALA-12252: Support distcc server on Ubuntu 20.04
     new d19f895c6 IMPALA-12237: Add information about the table type in the lineage log
     new 87fd844d3 IMPALA-11941: (Addendum) Produce shaded copy of Jamm

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 be/src/common/init.cc                              |    4 +-
 be/src/util/lineage-util.h                         |    2 +
 bin/distcc/distcc_server_bootstrap.sh              |    9 +-
 bin/distcc/distcc_server_setup.sh                  |   11 +-
 bin/run-all-tests.sh                               |    2 +-
 common/thrift/LineageGraph.thrift                  |    5 +-
 fe/pom.xml                                         |   12 +-
 .../apache/impala/analysis/ColumnLineageGraph.java |   61 +-
 .../impala/analysis/CreateOrAlterViewStmtBase.java |    3 +-
 .../java/org/apache/impala/planner/Planner.java    |    6 +-
 .../org/apache/impala/planner/PlannerTestBase.java |    5 +-
 java/pom.xml                                       |    1 +
 java/shaded-deps/{hive-exec => jamm}/.gitignore    |    0
 java/shaded-deps/jamm/pom.xml                      |   64 +
 .../queries/PlannerTest/lineage.test               | 1922 +++++++++++++----
 .../queries/QueryTest/lineage.test                 | 2215 +++++++++++++-------
 tests/verifiers/test_banned_log_messages.py        |    3 +
 17 files changed, 3189 insertions(+), 1136 deletions(-)
 copy java/shaded-deps/{hive-exec => jamm}/.gitignore (100%)
 create mode 100644 java/shaded-deps/jamm/pom.xml


[impala] 01/03: IMPALA-12252: Support distcc server on Ubuntu 20.04

Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

michaelsmith pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/impala.git

commit 5fe088f9526ce0c460e095b7f639d4af46e0f97d
Author: Zoltan Borok-Nagy <bo...@cloudera.com>
AuthorDate: Wed Jun 28 17:11:47 2023 +0200

    IMPALA-12252: Support distcc server on Ubuntu 20.04
    
    This patch updates our scripts to support our distcc server to be
    executed on Ubuntu 20.04.
    
    One issue to overcome was because of a security fix in distcc. Newer
    versions only allow compiler programs to be executed if they have
    a symlink under /usr/lib/distcc.
    
    Testing:
     * tested manually
    
    Change-Id: I3cb4dbb210ec22195450dd1a0cb64e00a4559c19
    Reviewed-on: http://gerrit.cloudera.org:8080/20137
    Reviewed-by: Impala Public Jenkins <im...@cloudera.com>
    Tested-by: Impala Public Jenkins <im...@cloudera.com>
---
 bin/distcc/distcc_server_bootstrap.sh |  9 +++++++--
 bin/distcc/distcc_server_setup.sh     | 11 +++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/bin/distcc/distcc_server_bootstrap.sh b/bin/distcc/distcc_server_bootstrap.sh
index 187366478..3c5ee77d7 100755
--- a/bin/distcc/distcc_server_bootstrap.sh
+++ b/bin/distcc/distcc_server_bootstrap.sh
@@ -36,8 +36,8 @@ fi
 OS_ID=$(source /etc/os-release && echo $ID)
 OS_VERSION=$(source /etc/os-release && echo $VERSION_ID)
 if [[ "$OS_ID" == Ubuntu ]]; then
-  if ! [[ $OS_VERSION == 16.04 || $OS_VERSION == 18.04 ]]; then
-    echo "This script only supports Ubuntu 16.04 and 18.04" >&2
+  if ! [[ $OS_VERSION == 16.04 || $OS_VERSION == 18.04 || $OS_VERSION == 20.04 ]]; then
+    echo "This script only supports Ubuntu 16.04, 18.04, and 20.04" >&2
     exit 1
   fi
 fi
@@ -72,4 +72,9 @@ sudo -u distccd -H bash <<"EOF"
  DOWNLOAD_CDH_COMPONENTS=false ./bin/bootstrap_toolchain.py
 EOF
 
+# To resolve CVE-2004-2687, newer distcc versions only allow programs to be executed
+# if they have a symlink under '/usr/lib/distcc'.
+# https://github.com/distcc/distcc/commit/dfb45b528746bf89c030fccac307ebcf7c988512
+sudo ln -s $(which ccache) /usr/lib/distcc/ccache
+
 (cd impala && ./bin/distcc/distcc_server_setup.sh "$@")
diff --git a/bin/distcc/distcc_server_setup.sh b/bin/distcc/distcc_server_setup.sh
index 8d5d7bb98..05a88d90b 100755
--- a/bin/distcc/distcc_server_setup.sh
+++ b/bin/distcc/distcc_server_setup.sh
@@ -60,8 +60,9 @@ ALLOWED_NETS=$1
 OS_ID=$(source /etc/os-release && echo "$ID")
 OS_VERSION=$(source /etc/os-release && echo "$VERSION_ID")
 if [[ "$OS_ID" == ubuntu ]]; then
-  if ! [[ $OS_VERSION == 14.04 || $OS_VERSION == 16.04 || $OS_VERSION == 18.04 ]]; then
-    echo "This script only supports Ubuntu 14.04, 16.04 and 18.04" >&2
+  if ! [[ $OS_VERSION == 14.04 || $OS_VERSION == 16.04 || $OS_VERSION == 18.04 || \
+      $OS_VERSION == 20.04 ]]; then
+    echo "This script only supports Ubuntu 14.04, 16.04, 18.04, and 20.04" >&2
     exit 1
   fi
   LINUX_FLAVOUR=ubuntu
@@ -125,3 +126,9 @@ service ${DISTCCD_SERVICE} restart
 
 echo "Symlinking /opt/Impala-Toolchain to default toolchain location"
 ln -f -s -T "${IMPALA_HOME}/toolchain" /opt/Impala-Toolchain
+
+# To resolve CVE-2004-2687, newer distcc versions only allow programs to be executed
+# if they have a symlink under '/usr/lib/distcc'.
+# https://github.com/distcc/distcc/commit/dfb45b528746bf89c030fccac307ebcf7c988512
+echo "Creating symlink for ccache:"
+ln -s $(which ccache) /usr/lib/distcc/ccache


[impala] 03/03: IMPALA-11941: (Addendum) Produce shaded copy of Jamm

Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

michaelsmith pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/impala.git

commit 87fd844d3ec8fd4665519497daf9a7f4cf148a53
Author: Michael Smith <mi...@cloudera.com>
AuthorDate: Fri Jun 30 11:28:11 2023 -0700

    IMPALA-11941: (Addendum) Produce shaded copy of Jamm
    
    Produces a shaded copy of a pre-release jamm jar that supports Java 17.
    Building a copy of jamm and directly depending on it meant any consumer
    of Impala would have to provide their own build of it.
    
    Testing: ran custom_cluster/test_local_catalog.py with Java 8 and 17
    
    Change-Id: Ida42d720a2639b65391c07a9237556311e04fac6
    Reviewed-on: http://gerrit.cloudera.org:8080/20147
    Reviewed-by: Michael Smith <mi...@cloudera.com>
    Tested-by: Michael Smith <mi...@cloudera.com>
---
 be/src/common/init.cc                       |  4 +-
 bin/run-all-tests.sh                        |  2 +-
 fe/pom.xml                                  | 12 ++++--
 java/pom.xml                                |  1 +
 java/shaded-deps/jamm/.gitignore            |  1 +
 java/shaded-deps/jamm/pom.xml               | 64 +++++++++++++++++++++++++++++
 tests/verifiers/test_banned_log_messages.py |  3 ++
 7 files changed, 81 insertions(+), 6 deletions(-)

diff --git a/be/src/common/init.cc b/be/src/common/init.cc
index db76f46eb..86379cb15 100644
--- a/be/src/common/init.cc
+++ b/be/src/common/init.cc
@@ -351,11 +351,11 @@ static Status JavaAddJammAgent() {
   istringstream classpath {getenv("CLASSPATH")};
   string jamm_path, test_path;
   while (getline(classpath, test_path, ':')) {
-    jamm_path = FileSystemUtil::FindFileInPath(test_path, "jamm-.*.jar");
+    jamm_path = FileSystemUtil::FindFileInPath(test_path, "impala-jamm-.*.jar");
     if (!jamm_path.empty()) break;
   }
   if (jamm_path.empty()) {
-    return Status("Could not find jamm-*.jar in Java CLASSPATH");
+    return Status("Could not find impala-jamm-*.jar in Java CLASSPATH");
   }
   val_out << "-javaagent:" << jamm_path;
 
diff --git a/bin/run-all-tests.sh b/bin/run-all-tests.sh
index 8f419c777..81be57ae0 100755
--- a/bin/run-all-tests.sh
+++ b/bin/run-all-tests.sh
@@ -245,7 +245,7 @@ do
     pushd "${IMPALA_FE_DIR}"
 
     # Add Jamm as javaagent for CatalogdMetaProviderTest.testWeights
-    JAMM_JAR=$(compgen -G ${IMPALA_HOME}/fe/target/dependency/jamm-*.jar)
+    JAMM_JAR=$(compgen -G ${IMPALA_HOME}/fe/target/dependency/impala-jamm-*.jar)
     export JAVA_TOOL_OPTIONS="${JAVA_TOOL_OPTIONS-} -javaagent:${JAMM_JAR}"
 
     if $JAVA -version 2>&1 | grep -q -E ' version "(9|[1-9][0-9])\.'; then
diff --git a/fe/pom.xml b/fe/pom.xml
index bfa588176..3b9fd5fab 100644
--- a/fe/pom.xml
+++ b/fe/pom.xml
@@ -364,9 +364,15 @@ under the License.
     </dependency>
 
     <dependency>
-      <groupId>com.github.jbellis</groupId>
-      <artifactId>jamm</artifactId>
-      <version>0.4.0-IMPALA</version>
+      <groupId>org.apache.impala</groupId>
+      <artifactId>impala-jamm</artifactId>
+      <version>${project.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>*</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <dependency>
diff --git a/java/pom.xml b/java/pom.xml
index 76364f06d..29a8a7c3b 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -370,6 +370,7 @@ under the License.
     <module>../fe</module>
     <module>query-event-hook-api</module>
     <module>shaded-deps/hive-exec</module>
+    <module>shaded-deps/jamm</module>
     <module>shaded-deps/s3a-aws-sdk</module>
     <module>TableFlattener</module>
     <module>test-hive-udfs</module>
diff --git a/java/shaded-deps/jamm/.gitignore b/java/shaded-deps/jamm/.gitignore
new file mode 100644
index 000000000..916e17c09
--- /dev/null
+++ b/java/shaded-deps/jamm/.gitignore
@@ -0,0 +1 @@
+dependency-reduced-pom.xml
diff --git a/java/shaded-deps/jamm/pom.xml b/java/shaded-deps/jamm/pom.xml
new file mode 100644
index 000000000..345b762a4
--- /dev/null
+++ b/java/shaded-deps/jamm/pom.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+                      http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <!-- This pom shades an unreleased version of jamm, as others need the JAR available to
+       use Impala jars. -->
+  <parent>
+    <groupId>org.apache.impala</groupId>
+    <artifactId>impala-parent</artifactId>
+    <version>4.3.0-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>impala-jamm</artifactId>
+  <packaging>jar</packaging>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.github.jbellis</groupId>
+      <artifactId>jamm</artifactId>
+      <version>0.4.0-IMPALA</version>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>3.4.1</version>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <transformers>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                  <manifestEntries>
+                    <Premain-Class>org.github.jamm.MemoryMeter</Premain-Class>
+                  </manifestEntries>
+                </transformer>
+              </transformers>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/tests/verifiers/test_banned_log_messages.py b/tests/verifiers/test_banned_log_messages.py
index 1f4d52162..627434139 100644
--- a/tests/verifiers/test_banned_log_messages.py
+++ b/tests/verifiers/test_banned_log_messages.py
@@ -33,6 +33,9 @@ class TestBannedLogMessages(ImpalaTestSuite):
   def assert_message_absent(self, message, log_dir=os.environ["IMPALA_LOGS_DIR"]):
     for root, _, files in os.walk(log_dir):
       for file in files:
+        if file == 'mvn.log':
+          # Skip mvn.log as some builds warn about extra shaded classes
+          continue
         log_file_path = os.path.join(root, file)
         returncode = subprocess.call(['grep', message, log_file_path])
         assert returncode == 1, "%s contains '%s'" % (log_file_path, message)


[impala] 02/03: IMPALA-12237: Add information about the table type in the lineage log

Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

michaelsmith pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/impala.git

commit d19f895c623b4c95b6731fe8338199b301aea470
Author: Zoltan Borok-Nagy <bo...@cloudera.com>
AuthorDate: Fri Jun 23 14:59:16 2023 +0200

    IMPALA-12237: Add information about the table type in the lineage log
    
    Apache Atlas needs table type information to correctly build the lineage
    graph. This patch set adds a new field to the metadata of the lineage
    graph vertices: 'tableType'.
    
    Table type can be:
     * hive
     * iceberg
     * kudu
     * hbase
     * view
     * virtual
     * external-datasource
    
    Tests:
     * updated current tests with the new field
     * added new tests focusing on Iceberg
    
    Change-Id: I13aeb256ff6b1d0e3c2eb43f7f75513ffc2cd20e
    Reviewed-on: http://gerrit.cloudera.org:8080/20120
    Reviewed-by: Impala Public Jenkins <im...@cloudera.com>
    Tested-by: Impala Public Jenkins <im...@cloudera.com>
---
 be/src/util/lineage-util.h                         |    2 +
 common/thrift/LineageGraph.thrift                  |    5 +-
 .../apache/impala/analysis/ColumnLineageGraph.java |   61 +-
 .../impala/analysis/CreateOrAlterViewStmtBase.java |    3 +-
 .../java/org/apache/impala/planner/Planner.java    |    6 +-
 .../org/apache/impala/planner/PlannerTestBase.java |    5 +-
 .../queries/PlannerTest/lineage.test               | 1922 +++++++++++++----
 .../queries/QueryTest/lineage.test                 | 2215 +++++++++++++-------
 8 files changed, 3093 insertions(+), 1126 deletions(-)

diff --git a/be/src/util/lineage-util.h b/be/src/util/lineage-util.h
index 959407fa3..3382d0340 100644
--- a/be/src/util/lineage-util.h
+++ b/be/src/util/lineage-util.h
@@ -47,6 +47,8 @@ class LineageUtil {
         writer->StartObject();
         writer->String("tableName");
         writer->String(vertex.metadata.table_name.c_str());
+        writer->String("tableType");
+        writer->String(vertex.metadata.table_type.c_str());
         writer->String("tableCreateTime");
         writer->Int64(vertex.metadata.table_create_time);
         writer->EndObject();
diff --git a/common/thrift/LineageGraph.thrift b/common/thrift/LineageGraph.thrift
index 357db065c..61b2f5610 100644
--- a/common/thrift/LineageGraph.thrift
+++ b/common/thrift/LineageGraph.thrift
@@ -24,8 +24,11 @@ struct TVertexMetadata {
   // Table name.
   1: required string table_name
 
+  // Type of the table (e.g. hive, iceberg, kudu, hbase)
+  2: required string table_type
+
   // Create time of the table/view.
-  2: required i64 table_create_time
+  3: required i64 table_create_time
 }
 
 struct TVertex {
diff --git a/fe/src/main/java/org/apache/impala/analysis/ColumnLineageGraph.java b/fe/src/main/java/org/apache/impala/analysis/ColumnLineageGraph.java
index 75900cb18..1a5dec544 100644
--- a/fe/src/main/java/org/apache/impala/analysis/ColumnLineageGraph.java
+++ b/fe/src/main/java/org/apache/impala/analysis/ColumnLineageGraph.java
@@ -34,7 +34,15 @@ import java.util.TreeSet;
 
 import com.google.common.collect.ImmutableSortedMap;
 import org.apache.impala.analysis.ColumnLineageGraph.Vertex.Metadata;
+import org.apache.impala.catalog.FeDataSource;
+import org.apache.impala.catalog.FeDataSourceTable;
+import org.apache.impala.catalog.FeFsTable;
+import org.apache.impala.catalog.FeHBaseTable;
+import org.apache.impala.catalog.FeIcebergTable;
+import org.apache.impala.catalog.FeKuduTable;
 import org.apache.impala.catalog.FeTable;
+import org.apache.impala.catalog.FeView;
+import org.apache.impala.catalog.VirtualTable;
 import org.apache.impala.common.Id;
 import org.apache.impala.common.IdGenerator;
 import org.apache.impala.thrift.TEdgeType;
@@ -84,6 +92,13 @@ import com.google.common.hash.Hashing;
  *   partition by and/or order by clause.
  */
 public class ColumnLineageGraph {
+  public static final String ICEBERG = "iceberg";
+  public static final String HIVE = "hive";
+  public static final String KUDU = "kudu";
+  public static final String HBASE = "hbase";
+  public static final String VIEW = "view";
+  public static final String VIRTUAL = "virtual";
+  public static final String EXTERNAL_DATASOURCE = "external-datasource";
   /**
    * Represents a vertex in the column lineage graph. A Vertex may correspond to a base
    * table column, a column in the destination table (for the case of INSERT or CTAS
@@ -92,10 +107,12 @@ public class ColumnLineageGraph {
   public static final class Vertex implements Comparable<Vertex> {
     public static class Metadata {
       private final String tableName_; // the table name
+      private final String tableType_; // type of the table
       private final long tableCreateTime_; // the table/view create time
 
-      public Metadata(String tableName, long tableCreateTime) {
+      public Metadata(String tableName, String tableType, long tableCreateTime) {
         tableName_ = tableName;
+        tableType_ = tableType;
         tableCreateTime_ = tableCreateTime;
       }
 
@@ -105,12 +122,13 @@ public class ColumnLineageGraph {
         if (o == null || getClass() != o.getClass()) return false;
         Metadata metadata = (Metadata) o;
         return tableCreateTime_ == metadata.tableCreateTime_ &&
-            Objects.equals(tableName_, metadata.tableName_);
+            Objects.equals(tableName_, metadata.tableName_) &&
+            Objects.equals(tableType_, metadata.tableType_);
       }
 
       @Override
       public int hashCode() {
-        return Objects.hash(tableName_, tableCreateTime_);
+        return Objects.hash(tableName_, tableType_, tableCreateTime_);
       }
 
       /**
@@ -120,7 +138,8 @@ public class ColumnLineageGraph {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
         Metadata metadata = (Metadata) o;
-        return Objects.equals(tableName_, metadata.tableName_);
+        return Objects.equals(tableName_, metadata.tableName_) &&
+            Objects.equals(tableType_, metadata.tableType_);
       }
     }
 
@@ -162,6 +181,7 @@ public class ColumnLineageGraph {
       if (metadata_ != null) {
         JSONObject jsonMetadata = new JSONObject();
         jsonMetadata.put("tableName", metadata_.tableName_);
+        jsonMetadata.put("tableType", metadata_.tableType_);
         jsonMetadata.put("tableCreateTime", metadata_.tableCreateTime_);
         obj.put("metadata", jsonMetadata);
       }
@@ -179,8 +199,9 @@ public class ColumnLineageGraph {
         return new Vertex(new VertexId(id), label, null);
       }
       String tableName = (String) jsonMetadata.get("tableName");
+      String tableType = (String) jsonMetadata.get("tableType");
       long tableCreateTime = (Long) jsonMetadata.get("tableCreateTime");
-      return new Vertex(new VertexId(id), label, new Metadata(tableName,
+      return new Vertex(new VertexId(id), label, new Metadata(tableName, tableType,
           tableCreateTime));
     }
 
@@ -191,7 +212,7 @@ public class ColumnLineageGraph {
       TVertex vertex = new TVertex(id_.asInt(), label_);
       if (metadata_ != null) {
         TVertexMetadata metadata = new TVertexMetadata(metadata_.tableName_,
-            metadata_.tableCreateTime_);
+            metadata_.tableType_, metadata_.tableCreateTime_);
         vertex.setMetadata(metadata);
       }
       return vertex;
@@ -206,6 +227,7 @@ public class ColumnLineageGraph {
       Metadata metadata = null;
       if (thriftMetadata != null) {
         metadata = new Metadata(thriftMetadata.getTable_name(),
+            thriftMetadata.getTable_type(),
             thriftMetadata.getTable_create_time());
       }
       return new Vertex(new VertexId(id), vertex.label, metadata);
@@ -395,14 +417,16 @@ public class ColumnLineageGraph {
   public static class ColumnLabel implements Comparable<ColumnLabel> {
     private final String columnLabel_;
     private final TableName tableName_;
+    private final String tableType_;
 
-    public ColumnLabel(String columnName, TableName tableName) {
+    public ColumnLabel(String columnName, TableName tableName, String tableType) {
       columnLabel_ = columnName;
       tableName_ = tableName;
+      tableType_ = tableType;
     }
 
     public ColumnLabel(String columnName) {
-      this(columnName, null);
+      this(columnName, null, null);
     }
 
     @Override
@@ -493,12 +517,12 @@ public class ColumnLineageGraph {
       if (target.tableName_ != null) {
         FeTable feTable = analyzer.getStmtTableCache().tables.get(target.tableName_);
         if (feTable != null && feTable.getMetaStoreTable() != null) {
-          metadata = new Metadata(target.tableName_.toString(),
+          metadata = new Metadata(target.tableName_.toString(), getTableType(feTable),
               feTable.getMetaStoreTable().getCreateTime());
         } else {
           // -1 is just a placeholder that will be updated after the table/view has been
           // created. See client-request-state.cc (LogLineageRecord) for more information.
-          metadata = new Metadata(target.tableName_.toString(), -1);
+          metadata = new Metadata(target.tableName_.toString(), target.tableType_, -1);
         }
       }
       targetVertices.add(createVertex(target.columnLabel_, metadata));
@@ -510,6 +534,7 @@ public class ColumnLineageGraph {
       Preconditions.checkState(feTable != null);
       Metadata metadata = feTable != null && feTable.getMetaStoreTable() != null ?
           new Metadata(feTable.getTableName().toString(),
+              getTableType(feTable),
               feTable.getMetaStoreTable().getCreateTime()) : null;
       sourceVertices.add(createVertex(source.getKey(), metadata));
     }
@@ -518,6 +543,19 @@ public class ColumnLineageGraph {
     return edge;
   }
 
+  public static String getTableType(FeTable tbl) {
+    if (tbl instanceof FeIcebergTable) return ICEBERG;
+    if (tbl instanceof FeFsTable) return HIVE;
+    if (tbl instanceof FeKuduTable) return KUDU;
+    if (tbl instanceof FeHBaseTable) return HBASE;
+    if (tbl instanceof FeView) return VIEW;
+    if (tbl instanceof VirtualTable) return VIRTUAL;
+    if (tbl instanceof FeDataSourceTable) return EXTERNAL_DATASOURCE;
+    LOG.error(String.format("Table '%s' has unknown type: '%s'", tbl.getFullName(),
+        tbl.getClass().getName()));
+    return "unknown";
+  }
+
   /**
    * Creates a new vertex in the column lineage graph. The new Vertex object is
    * returned. If a Vertex with the same label already exists, reuse it.
@@ -904,7 +942,8 @@ public class ColumnLineageGraph {
   public void addTargetColumnLabels(FeTable dstTable) {
     Preconditions.checkNotNull(dstTable);
     for (String columnName: dstTable.getColumnNames()) {
-      targetColumnLabels_.add(new ColumnLabel(columnName, dstTable.getTableName()));
+      targetColumnLabels_.add(new ColumnLabel(columnName, dstTable.getTableName(),
+          getTableType(dstTable)));
     }
   }
 }
diff --git a/fe/src/main/java/org/apache/impala/analysis/CreateOrAlterViewStmtBase.java b/fe/src/main/java/org/apache/impala/analysis/CreateOrAlterViewStmtBase.java
index 660d0930f..3f2fa4d61 100755
--- a/fe/src/main/java/org/apache/impala/analysis/CreateOrAlterViewStmtBase.java
+++ b/fe/src/main/java/org/apache/impala/analysis/CreateOrAlterViewStmtBase.java
@@ -183,7 +183,8 @@ public abstract class CreateOrAlterViewStmtBase extends StatementBase {
     ColumnLineageGraph graph = analyzer.getColumnLineageGraph();
     List<ColumnLabel> colDefs = new ArrayList<>();
     for (ColumnDef colDef: finalColDefs_) {
-      colDefs.add(new ColumnLabel(colDef.getColName(), new TableName(dbName_, getTbl())));
+      colDefs.add(new ColumnLabel(colDef.getColName(), new TableName(dbName_, getTbl()),
+          ColumnLineageGraph.VIEW));
     }
     graph.addTargetColumnLabels(colDefs);
     graph.computeLineageGraph(viewDefStmt_.getResultExprs(), analyzer);
diff --git a/fe/src/main/java/org/apache/impala/planner/Planner.java b/fe/src/main/java/org/apache/impala/planner/Planner.java
index f91c30990..9a35bef7e 100644
--- a/fe/src/main/java/org/apache/impala/planner/Planner.java
+++ b/fe/src/main/java/org/apache/impala/planner/Planner.java
@@ -228,7 +228,8 @@ public class Planner {
             Preconditions.checkState(!mentionedColumns.isEmpty());
             List<ColumnLabel> targetColLabels = new ArrayList<>();
             for (String column: mentionedColumns) {
-              targetColLabels.add(new ColumnLabel(column, targetTable.getTableName()));
+              targetColLabels.add(new ColumnLabel(column, targetTable.getTableName(),
+                  ColumnLineageGraph.getTableType(targetTable)));
             }
             graph.addTargetColumnLabels(targetColLabels);
           } else {
@@ -242,7 +243,8 @@ public class Planner {
               List<ColumnLabel> targetColLabels = new ArrayList<>();
               for (String column: targetTable.getColumnNames()) {
                 if (column.equals(Schema.getAutoIncrementingColumnName())) continue;
-                targetColLabels.add(new ColumnLabel(column, targetTable.getTableName()));
+                targetColLabels.add(new ColumnLabel(column, targetTable.getTableName(),
+                    ColumnLineageGraph.getTableType(targetTable)));
               }
               graph.addTargetColumnLabels(targetColLabels);
             } else {
diff --git a/fe/src/test/java/org/apache/impala/planner/PlannerTestBase.java b/fe/src/test/java/org/apache/impala/planner/PlannerTestBase.java
index 71c35a9c0..154da24ea 100644
--- a/fe/src/test/java/org/apache/impala/planner/PlannerTestBase.java
+++ b/fe/src/test/java/org/apache/impala/planner/PlannerTestBase.java
@@ -738,8 +738,11 @@ public class PlannerTestBase extends FrontendTestBase {
     String query = testCase.getQuery();
     ArrayList<String> expectedLineage = testCase.getSectionContents(Section.LINEAGE);
     if (expectedLineage == null || expectedLineage.isEmpty()) return;
+    if (execRequest == null) {
+      errorLog.append("Failed to execute query:\n" + query + "\n");
+      return;
+    }
     TLineageGraph lineageGraph = null;
-    if (execRequest == null) return;
     if (execRequest.isSetQuery_exec_request()) {
       lineageGraph = execRequest.query_exec_request.lineage_graph;
     } else if (execRequest.isSetCatalog_op_request()) {
diff --git a/testdata/workloads/functional-planner/queries/PlannerTest/lineage.test b/testdata/workloads/functional-planner/queries/PlannerTest/lineage.test
index 3d35c2f07..aa7a8de8c 100644
--- a/testdata/workloads/functional-planner/queries/PlannerTest/lineage.test
+++ b/testdata/workloads/functional-planner/queries/PlannerTest/lineage.test
@@ -8,9 +8,9 @@ select * from (
 {
     "queryText":"select * from (\n  select tinyint_col + int_col x from functional.alltypes\n  union all\n  select sum(bigint_col) y from (select bigint_col from functional.alltypes) v1) v2",
     "queryId":"0:0",
-    "hash":"25456c60a2e874a20732f42c7af27553",
+    "hash":"1a88e455569d619b268157867d97489d",
     "user":"dummy_user",
-    "timestamp":1547867921,
+    "timestamp":1687551743,
     "edges":[
         {
             "sources":[
@@ -35,8 +35,9 @@ select * from (
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.bigint_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         },
         {
@@ -44,8 +45,9 @@ select * from (
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.int_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         },
         {
@@ -53,8 +55,9 @@ select * from (
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.tinyint_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         }
     ]
@@ -74,9 +77,9 @@ order by b.bigint_col limit 10
 {
     "queryText":"select sum(a.tinyint_col) over (partition by a.smallint_col order by a.id),\n  count(b.string_col), b.timestamp_col\nfrom functional.alltypes a join functional.alltypessmall b on (a.id = b.id)\nwhere a.year = 2010 and b.float_col > 0\ngroup by a.tinyint_col, a.smallint_col, a.id, b.string_col, b.timestamp_col, b.bigint_col\nhaving count(a.int_col) > 10\norder by b.bigint_col limit 10",
     "queryId":"0:0",
-    "hash":"e0309eeff9811f53c82657d62c1e04eb",
+    "hash":"ea11605d73c3e77c40d2905de9a1f008",
     "user":"dummy_user",
-    "timestamp":1547867921,
+    "timestamp":1687551744,
     "edges":[
         {
             "sources":[
@@ -147,8 +150,9 @@ order by b.bigint_col limit 10
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.tinyint_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         },
         {
@@ -156,8 +160,9 @@ order by b.bigint_col limit 10
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.id",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         },
         {
@@ -165,8 +170,9 @@ order by b.bigint_col limit 10
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.smallint_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         },
         {
@@ -179,8 +185,9 @@ order by b.bigint_col limit 10
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypessmall.string_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypessmall",
-                "tableCreateTime":1559151325
+                "tableCreateTime":1687531269
             }
         },
         {
@@ -193,8 +200,9 @@ order by b.bigint_col limit 10
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypessmall.timestamp_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypessmall",
-                "tableCreateTime":1559151325
+                "tableCreateTime":1687531269
             }
         },
         {
@@ -202,8 +210,9 @@ order by b.bigint_col limit 10
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.int_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         },
         {
@@ -211,8 +220,9 @@ order by b.bigint_col limit 10
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.year",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         },
         {
@@ -220,8 +230,9 @@ order by b.bigint_col limit 10
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypessmall.bigint_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypessmall",
-                "tableCreateTime":1559151325
+                "tableCreateTime":1687531269
             }
         },
         {
@@ -229,8 +240,9 @@ order by b.bigint_col limit 10
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypessmall.float_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypessmall",
-                "tableCreateTime":1559151325
+                "tableCreateTime":1687531269
             }
         },
         {
@@ -238,8 +250,9 @@ order by b.bigint_col limit 10
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypessmall.id",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypessmall",
-                "tableCreateTime":1559151325
+                "tableCreateTime":1687531269
             }
         }
     ]
@@ -251,9 +264,9 @@ create table lineage_test_tbl as select int_col, tinyint_col from functional.all
 {
     "queryText":"create table lineage_test_tbl as select int_col, tinyint_col from functional.alltypes",
     "queryId":"0:0",
-    "hash":"407f23b24758ffcb2ac445b9703f5c44",
+    "hash":"2f673a20092048a5035f4a01edd612fd",
     "user":"dummy_user",
-    "timestamp":1547867921,
+    "timestamp":1687551744,
     "edges":[
         {
             "sources":[
@@ -280,6 +293,7 @@ create table lineage_test_tbl as select int_col, tinyint_col from functional.all
             "vertexType":"COLUMN",
             "vertexId":"int_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"default.lineage_test_tbl",
                 "tableCreateTime":-1
             }
@@ -289,8 +303,9 @@ create table lineage_test_tbl as select int_col, tinyint_col from functional.all
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.int_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         },
         {
@@ -298,6 +313,7 @@ create table lineage_test_tbl as select int_col, tinyint_col from functional.all
             "vertexType":"COLUMN",
             "vertexId":"tinyint_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"default.lineage_test_tbl",
                 "tableCreateTime":-1
             }
@@ -307,8 +323,9 @@ create table lineage_test_tbl as select int_col, tinyint_col from functional.all
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.tinyint_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         }
     ]
@@ -322,9 +339,9 @@ where a.year = 2009 and b.month = 2
 {
     "queryText":"create table lineage_test_tbl as\nselect distinct a.int_col, a.string_col from functional.alltypes a\ninner join functional.alltypessmall b on (a.id = b.id)\nwhere a.year = 2009 and b.month = 2",
     "queryId":"0:0",
-    "hash":"f3101dcb046a7d34d7ee14892a6cc94e",
+    "hash":"2c547ba840dfc511483fd1a5909da15f",
     "user":"dummy_user",
-    "timestamp":1547867921,
+    "timestamp":1687551744,
     "edges":[
         {
             "sources":[
@@ -364,6 +381,7 @@ where a.year = 2009 and b.month = 2
             "vertexType":"COLUMN",
             "vertexId":"int_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"default.lineage_test_tbl",
                 "tableCreateTime":-1
             }
@@ -373,8 +391,9 @@ where a.year = 2009 and b.month = 2
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.int_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         },
         {
@@ -382,6 +401,7 @@ where a.year = 2009 and b.month = 2
             "vertexType":"COLUMN",
             "vertexId":"string_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"default.lineage_test_tbl",
                 "tableCreateTime":-1
             }
@@ -391,8 +411,9 @@ where a.year = 2009 and b.month = 2
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.string_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         },
         {
@@ -400,8 +421,9 @@ where a.year = 2009 and b.month = 2
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.id",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         },
         {
@@ -409,8 +431,9 @@ where a.year = 2009 and b.month = 2
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.year",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         },
         {
@@ -418,8 +441,9 @@ where a.year = 2009 and b.month = 2
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypessmall.id",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypessmall",
-                "tableCreateTime":1559151325
+                "tableCreateTime":1687531269
             }
         },
         {
@@ -427,8 +451,9 @@ where a.year = 2009 and b.month = 2
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypessmall.month",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypessmall",
-                "tableCreateTime":1559151325
+                "tableCreateTime":1687531269
             }
         }
     ]
@@ -442,9 +467,9 @@ select * from
 {
     "queryText":"create table lineage_test_tbl as\nselect * from\n  (select * from\n     (select int_col from functional.alltypestiny limit 1) v1 ) v2",
     "queryId":"0:0",
-    "hash":"9c04c1e9feee35ffacf14bfcd3b363a7",
+    "hash":"d34ab281d4fcf088efe7b558a5786a00",
     "user":"dummy_user",
-    "timestamp":1547867921,
+    "timestamp":1687551744,
     "edges":[
         {
             "sources":[
@@ -462,6 +487,7 @@ select * from
             "vertexType":"COLUMN",
             "vertexId":"int_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"default.lineage_test_tbl",
                 "tableCreateTime":-1
             }
@@ -471,8 +497,9 @@ select * from
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypestiny.int_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypestiny",
-                "tableCreateTime":1559151330
+                "tableCreateTime":1687531270
             }
         }
     ]
@@ -484,9 +511,9 @@ create table lineage_test_tblm as select * from functional_hbase.alltypes limit
 {
     "queryText":"create table lineage_test_tblm as select * from functional_hbase.alltypes limit 5",
     "queryId":"0:0",
-    "hash":"a294f36bddf2adb329eac3055a76b2b5",
+    "hash":"b69259e85dac890c7df82ca94dcf8c54",
     "user":"dummy_user",
-    "timestamp":1547867921,
+    "timestamp":1687551744,
     "edges":[
         {
             "sources":[
@@ -612,6 +639,7 @@ create table lineage_test_tblm as select * from functional_hbase.alltypes limit
             "vertexType":"COLUMN",
             "vertexId":"id",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"default.lineage_test_tblm",
                 "tableCreateTime":-1
             }
@@ -621,8 +649,9 @@ create table lineage_test_tblm as select * from functional_hbase.alltypes limit
             "vertexType":"COLUMN",
             "vertexId":"functional_hbase.alltypes.id",
             "metadata":{
+                "tableType":"hbase",
                 "tableName":"functional_hbase.alltypes",
-                "tableCreateTime":1559151687
+                "tableCreateTime":1687531612
             }
         },
         {
@@ -630,6 +659,7 @@ create table lineage_test_tblm as select * from functional_hbase.alltypes limit
             "vertexType":"COLUMN",
             "vertexId":"bigint_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"default.lineage_test_tblm",
                 "tableCreateTime":-1
             }
@@ -639,8 +669,9 @@ create table lineage_test_tblm as select * from functional_hbase.alltypes limit
             "vertexType":"COLUMN",
             "vertexId":"functional_hbase.alltypes.bigint_col",
             "metadata":{
+                "tableType":"hbase",
                 "tableName":"functional_hbase.alltypes",
-                "tableCreateTime":1559151687
+                "tableCreateTime":1687531612
             }
         },
         {
@@ -648,6 +679,7 @@ create table lineage_test_tblm as select * from functional_hbase.alltypes limit
             "vertexType":"COLUMN",
             "vertexId":"bool_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"default.lineage_test_tblm",
                 "tableCreateTime":-1
             }
@@ -657,8 +689,9 @@ create table lineage_test_tblm as select * from functional_hbase.alltypes limit
             "vertexType":"COLUMN",
             "vertexId":"functional_hbase.alltypes.bool_col",
             "metadata":{
+                "tableType":"hbase",
                 "tableName":"functional_hbase.alltypes",
-                "tableCreateTime":1559151687
+                "tableCreateTime":1687531612
             }
         },
         {
@@ -666,6 +699,7 @@ create table lineage_test_tblm as select * from functional_hbase.alltypes limit
             "vertexType":"COLUMN",
             "vertexId":"date_string_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"default.lineage_test_tblm",
                 "tableCreateTime":-1
             }
@@ -675,8 +709,9 @@ create table lineage_test_tblm as select * from functional_hbase.alltypes limit
             "vertexType":"COLUMN",
             "vertexId":"functional_hbase.alltypes.date_string_col",
             "metadata":{
+                "tableType":"hbase",
                 "tableName":"functional_hbase.alltypes",
-                "tableCreateTime":1559151687
+                "tableCreateTime":1687531612
             }
         },
         {
@@ -684,6 +719,7 @@ create table lineage_test_tblm as select * from functional_hbase.alltypes limit
             "vertexType":"COLUMN",
             "vertexId":"double_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"default.lineage_test_tblm",
                 "tableCreateTime":-1
             }
@@ -693,8 +729,9 @@ create table lineage_test_tblm as select * from functional_hbase.alltypes limit
             "vertexType":"COLUMN",
             "vertexId":"functional_hbase.alltypes.double_col",
             "metadata":{
+                "tableType":"hbase",
                 "tableName":"functional_hbase.alltypes",
-                "tableCreateTime":1559151687
+                "tableCreateTime":1687531612
             }
         },
         {
@@ -702,6 +739,7 @@ create table lineage_test_tblm as select * from functional_hbase.alltypes limit
             "vertexType":"COLUMN",
             "vertexId":"float_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"default.lineage_test_tblm",
                 "tableCreateTime":-1
             }
@@ -711,8 +749,9 @@ create table lineage_test_tblm as select * from functional_hbase.alltypes limit
             "vertexType":"COLUMN",
             "vertexId":"functional_hbase.alltypes.float_col",
             "metadata":{
+                "tableType":"hbase",
                 "tableName":"functional_hbase.alltypes",
-                "tableCreateTime":1559151687
+                "tableCreateTime":1687531612
             }
         },
         {
@@ -720,6 +759,7 @@ create table lineage_test_tblm as select * from functional_hbase.alltypes limit
             "vertexType":"COLUMN",
             "vertexId":"int_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"default.lineage_test_tblm",
                 "tableCreateTime":-1
             }
@@ -729,8 +769,9 @@ create table lineage_test_tblm as select * from functional_hbase.alltypes limit
             "vertexType":"COLUMN",
             "vertexId":"functional_hbase.alltypes.int_col",
             "metadata":{
+                "tableType":"hbase",
                 "tableName":"functional_hbase.alltypes",
-                "tableCreateTime":1559151687
+                "tableCreateTime":1687531612
             }
         },
         {
@@ -738,6 +779,7 @@ create table lineage_test_tblm as select * from functional_hbase.alltypes limit
             "vertexType":"COLUMN",
             "vertexId":"month",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"default.lineage_test_tblm",
                 "tableCreateTime":-1
             }
@@ -747,8 +789,9 @@ create table lineage_test_tblm as select * from functional_hbase.alltypes limit
             "vertexType":"COLUMN",
             "vertexId":"functional_hbase.alltypes.month",
             "metadata":{
+                "tableType":"hbase",
                 "tableName":"functional_hbase.alltypes",
-                "tableCreateTime":1559151687
+                "tableCreateTime":1687531612
             }
         },
         {
@@ -756,6 +799,7 @@ create table lineage_test_tblm as select * from functional_hbase.alltypes limit
             "vertexType":"COLUMN",
             "vertexId":"smallint_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"default.lineage_test_tblm",
                 "tableCreateTime":-1
             }
@@ -765,8 +809,9 @@ create table lineage_test_tblm as select * from functional_hbase.alltypes limit
             "vertexType":"COLUMN",
             "vertexId":"functional_hbase.alltypes.smallint_col",
             "metadata":{
+                "tableType":"hbase",
                 "tableName":"functional_hbase.alltypes",
-                "tableCreateTime":1559151687
+                "tableCreateTime":1687531612
             }
         },
         {
@@ -774,6 +819,7 @@ create table lineage_test_tblm as select * from functional_hbase.alltypes limit
             "vertexType":"COLUMN",
             "vertexId":"string_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"default.lineage_test_tblm",
                 "tableCreateTime":-1
             }
@@ -783,8 +829,9 @@ create table lineage_test_tblm as select * from functional_hbase.alltypes limit
             "vertexType":"COLUMN",
             "vertexId":"functional_hbase.alltypes.string_col",
             "metadata":{
+                "tableType":"hbase",
                 "tableName":"functional_hbase.alltypes",
-                "tableCreateTime":1559151687
+                "tableCreateTime":1687531612
             }
         },
         {
@@ -792,6 +839,7 @@ create table lineage_test_tblm as select * from functional_hbase.alltypes limit
             "vertexType":"COLUMN",
             "vertexId":"timestamp_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"default.lineage_test_tblm",
                 "tableCreateTime":-1
             }
@@ -801,8 +849,9 @@ create table lineage_test_tblm as select * from functional_hbase.alltypes limit
             "vertexType":"COLUMN",
             "vertexId":"functional_hbase.alltypes.timestamp_col",
             "metadata":{
+                "tableType":"hbase",
                 "tableName":"functional_hbase.alltypes",
-                "tableCreateTime":1559151687
+                "tableCreateTime":1687531612
             }
         },
         {
@@ -810,6 +859,7 @@ create table lineage_test_tblm as select * from functional_hbase.alltypes limit
             "vertexType":"COLUMN",
             "vertexId":"tinyint_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"default.lineage_test_tblm",
                 "tableCreateTime":-1
             }
@@ -819,8 +869,9 @@ create table lineage_test_tblm as select * from functional_hbase.alltypes limit
             "vertexType":"COLUMN",
             "vertexId":"functional_hbase.alltypes.tinyint_col",
             "metadata":{
+                "tableType":"hbase",
                 "tableName":"functional_hbase.alltypes",
-                "tableCreateTime":1559151687
+                "tableCreateTime":1687531612
             }
         },
         {
@@ -828,6 +879,7 @@ create table lineage_test_tblm as select * from functional_hbase.alltypes limit
             "vertexType":"COLUMN",
             "vertexId":"year",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"default.lineage_test_tblm",
                 "tableCreateTime":-1
             }
@@ -837,8 +889,9 @@ create table lineage_test_tblm as select * from functional_hbase.alltypes limit
             "vertexType":"COLUMN",
             "vertexId":"functional_hbase.alltypes.year",
             "metadata":{
+                "tableType":"hbase",
                 "tableName":"functional_hbase.alltypes",
-                "tableCreateTime":1559151687
+                "tableCreateTime":1687531612
             }
         }
     ]
@@ -853,9 +906,9 @@ functional_hbase.alltypes
 {
     "queryText":"insert into\nfunctional_hbase.alltypes\n  values (1, 1, true, \"1999-12-01\", 2.0, 1.0, 1, 12, 2, \"abs\",\n  cast(now() as timestamp), 1, 1999)",
     "queryId":"0:0",
-    "hash":"b923425ce9cc2d53d36523ec83971e67",
+    "hash":"7eacea08a1e442fae1edb6734cd15551",
     "user":"dummy_user",
-    "timestamp":1547867921,
+    "timestamp":1687551745,
     "edges":[
         {
             "sources":[
@@ -968,8 +1021,9 @@ functional_hbase.alltypes
             "vertexType":"COLUMN",
             "vertexId":"id",
             "metadata":{
+                "tableType":"hbase",
                 "tableName":"functional_hbase.alltypes",
-                "tableCreateTime":1559151687
+                "tableCreateTime":1687531612
             }
         },
         {
@@ -977,8 +1031,9 @@ functional_hbase.alltypes
             "vertexType":"COLUMN",
             "vertexId":"bigint_col",
             "metadata":{
+                "tableType":"hbase",
                 "tableName":"functional_hbase.alltypes",
-                "tableCreateTime":1559151687
+                "tableCreateTime":1687531612
             }
         },
         {
@@ -986,8 +1041,9 @@ functional_hbase.alltypes
             "vertexType":"COLUMN",
             "vertexId":"bool_col",
             "metadata":{
+                "tableType":"hbase",
                 "tableName":"functional_hbase.alltypes",
-                "tableCreateTime":1559151687
+                "tableCreateTime":1687531612
             }
         },
         {
@@ -995,8 +1051,9 @@ functional_hbase.alltypes
             "vertexType":"COLUMN",
             "vertexId":"date_string_col",
             "metadata":{
+                "tableType":"hbase",
                 "tableName":"functional_hbase.alltypes",
-                "tableCreateTime":1559151687
+                "tableCreateTime":1687531612
             }
         },
         {
@@ -1004,8 +1061,9 @@ functional_hbase.alltypes
             "vertexType":"COLUMN",
             "vertexId":"double_col",
             "metadata":{
+                "tableType":"hbase",
                 "tableName":"functional_hbase.alltypes",
-                "tableCreateTime":1559151687
+                "tableCreateTime":1687531612
             }
         },
         {
@@ -1013,8 +1071,9 @@ functional_hbase.alltypes
             "vertexType":"COLUMN",
             "vertexId":"float_col",
             "metadata":{
+                "tableType":"hbase",
                 "tableName":"functional_hbase.alltypes",
-                "tableCreateTime":1559151687
+                "tableCreateTime":1687531612
             }
         },
         {
@@ -1022,8 +1081,9 @@ functional_hbase.alltypes
             "vertexType":"COLUMN",
             "vertexId":"int_col",
             "metadata":{
+                "tableType":"hbase",
                 "tableName":"functional_hbase.alltypes",
-                "tableCreateTime":1559151687
+                "tableCreateTime":1687531612
             }
         },
         {
@@ -1031,8 +1091,9 @@ functional_hbase.alltypes
             "vertexType":"COLUMN",
             "vertexId":"month",
             "metadata":{
+                "tableType":"hbase",
                 "tableName":"functional_hbase.alltypes",
-                "tableCreateTime":1559151687
+                "tableCreateTime":1687531612
             }
         },
         {
@@ -1040,8 +1101,9 @@ functional_hbase.alltypes
             "vertexType":"COLUMN",
             "vertexId":"smallint_col",
             "metadata":{
+                "tableType":"hbase",
                 "tableName":"functional_hbase.alltypes",
-                "tableCreateTime":1559151687
+                "tableCreateTime":1687531612
             }
         },
         {
@@ -1049,8 +1111,9 @@ functional_hbase.alltypes
             "vertexType":"COLUMN",
             "vertexId":"string_col",
             "metadata":{
+                "tableType":"hbase",
                 "tableName":"functional_hbase.alltypes",
-                "tableCreateTime":1559151687
+                "tableCreateTime":1687531612
             }
         },
         {
@@ -1058,8 +1121,9 @@ functional_hbase.alltypes
             "vertexType":"COLUMN",
             "vertexId":"timestamp_col",
             "metadata":{
+                "tableType":"hbase",
                 "tableName":"functional_hbase.alltypes",
-                "tableCreateTime":1559151687
+                "tableCreateTime":1687531612
             }
         },
         {
@@ -1067,8 +1131,9 @@ functional_hbase.alltypes
             "vertexType":"COLUMN",
             "vertexId":"tinyint_col",
             "metadata":{
+                "tableType":"hbase",
                 "tableName":"functional_hbase.alltypes",
-                "tableCreateTime":1559151687
+                "tableCreateTime":1687531612
             }
         },
         {
@@ -1076,8 +1141,9 @@ functional_hbase.alltypes
             "vertexType":"COLUMN",
             "vertexId":"year",
             "metadata":{
+                "tableType":"hbase",
                 "tableName":"functional_hbase.alltypes",
-                "tableCreateTime":1559151687
+                "tableCreateTime":1687531612
             }
         }
     ]
@@ -1090,9 +1156,9 @@ from functional.alltypes
 {
     "queryText":"insert into table functional.alltypesnopart (id, bool_col, timestamp_col)\nselect id, bool_col, timestamp_col\nfrom functional.alltypes",
     "queryId":"0:0",
-    "hash":"b7b9474fc6b97f104bd031209438ee0e",
+    "hash":"24d103f36450208bfb8cccfa2db687c4",
     "user":"dummy_user",
-    "timestamp":1547867921,
+    "timestamp":1687551745,
     "edges":[
         {
             "sources":[
@@ -1192,8 +1258,9 @@ from functional.alltypes
             "vertexType":"COLUMN",
             "vertexId":"id",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypesnopart",
-                "tableCreateTime":1559151324
+                "tableCreateTime":1687531269
             }
         },
         {
@@ -1201,8 +1268,9 @@ from functional.alltypes
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.id",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         },
         {
@@ -1210,8 +1278,9 @@ from functional.alltypes
             "vertexType":"COLUMN",
             "vertexId":"bool_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypesnopart",
-                "tableCreateTime":1559151324
+                "tableCreateTime":1687531269
             }
         },
         {
@@ -1219,8 +1288,9 @@ from functional.alltypes
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.bool_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         },
         {
@@ -1228,8 +1298,9 @@ from functional.alltypes
             "vertexType":"COLUMN",
             "vertexId":"tinyint_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypesnopart",
-                "tableCreateTime":1559151324
+                "tableCreateTime":1687531269
             }
         },
         {
@@ -1237,8 +1308,9 @@ from functional.alltypes
             "vertexType":"COLUMN",
             "vertexId":"smallint_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypesnopart",
-                "tableCreateTime":1559151324
+                "tableCreateTime":1687531269
             }
         },
         {
@@ -1246,8 +1318,9 @@ from functional.alltypes
             "vertexType":"COLUMN",
             "vertexId":"int_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypesnopart",
-                "tableCreateTime":1559151324
+                "tableCreateTime":1687531269
             }
         },
         {
@@ -1255,8 +1328,9 @@ from functional.alltypes
             "vertexType":"COLUMN",
             "vertexId":"bigint_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypesnopart",
-                "tableCreateTime":1559151324
+                "tableCreateTime":1687531269
             }
         },
         {
@@ -1264,8 +1338,9 @@ from functional.alltypes
             "vertexType":"COLUMN",
             "vertexId":"float_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypesnopart",
-                "tableCreateTime":1559151324
+                "tableCreateTime":1687531269
             }
         },
         {
@@ -1273,8 +1348,9 @@ from functional.alltypes
             "vertexType":"COLUMN",
             "vertexId":"double_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypesnopart",
-                "tableCreateTime":1559151324
+                "tableCreateTime":1687531269
             }
         },
         {
@@ -1282,8 +1358,9 @@ from functional.alltypes
             "vertexType":"COLUMN",
             "vertexId":"date_string_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypesnopart",
-                "tableCreateTime":1559151324
+                "tableCreateTime":1687531269
             }
         },
         {
@@ -1291,8 +1368,9 @@ from functional.alltypes
             "vertexType":"COLUMN",
             "vertexId":"string_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypesnopart",
-                "tableCreateTime":1559151324
+                "tableCreateTime":1687531269
             }
         },
         {
@@ -1300,8 +1378,9 @@ from functional.alltypes
             "vertexType":"COLUMN",
             "vertexId":"timestamp_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypesnopart",
-                "tableCreateTime":1559151324
+                "tableCreateTime":1687531269
             }
         },
         {
@@ -1309,8 +1388,9 @@ from functional.alltypes
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.timestamp_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         }
     ]
@@ -1325,9 +1405,9 @@ where year=2009 and month=05
 {
     "queryText":"insert into table functional.alltypessmall (smallint_col, int_col)\npartition (year=2009, month=04)\nselect smallint_col, int_col\nfrom functional.alltypes\nwhere year=2009 and month=05",
     "queryId":"0:0",
-    "hash":"2ed3a6c784e1c0c7fcef226d71375180",
+    "hash":"1d7f2ed12efeb2876353734d7f1fca33",
     "user":"dummy_user",
-    "timestamp":1547867921,
+    "timestamp":1687551745,
     "edges":[
         {
             "sources":[
@@ -1464,8 +1544,9 @@ where year=2009 and month=05
             "vertexType":"COLUMN",
             "vertexId":"year",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypessmall",
-                "tableCreateTime":1559151325
+                "tableCreateTime":1687531269
             }
         },
         {
@@ -1473,8 +1554,9 @@ where year=2009 and month=05
             "vertexType":"COLUMN",
             "vertexId":"month",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypessmall",
-                "tableCreateTime":1559151325
+                "tableCreateTime":1687531269
             }
         },
         {
@@ -1482,8 +1564,9 @@ where year=2009 and month=05
             "vertexType":"COLUMN",
             "vertexId":"id",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypessmall",
-                "tableCreateTime":1559151325
+                "tableCreateTime":1687531269
             }
         },
         {
@@ -1491,8 +1574,9 @@ where year=2009 and month=05
             "vertexType":"COLUMN",
             "vertexId":"bool_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypessmall",
-                "tableCreateTime":1559151325
+                "tableCreateTime":1687531269
             }
         },
         {
@@ -1500,8 +1584,9 @@ where year=2009 and month=05
             "vertexType":"COLUMN",
             "vertexId":"tinyint_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypessmall",
-                "tableCreateTime":1559151325
+                "tableCreateTime":1687531269
             }
         },
         {
@@ -1509,8 +1594,9 @@ where year=2009 and month=05
             "vertexType":"COLUMN",
             "vertexId":"smallint_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypessmall",
-                "tableCreateTime":1559151325
+                "tableCreateTime":1687531269
             }
         },
         {
@@ -1518,8 +1604,9 @@ where year=2009 and month=05
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.smallint_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         },
         {
@@ -1527,8 +1614,9 @@ where year=2009 and month=05
             "vertexType":"COLUMN",
             "vertexId":"int_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypessmall",
-                "tableCreateTime":1559151325
+                "tableCreateTime":1687531269
             }
         },
         {
@@ -1536,8 +1624,9 @@ where year=2009 and month=05
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.int_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         },
         {
@@ -1545,8 +1634,9 @@ where year=2009 and month=05
             "vertexType":"COLUMN",
             "vertexId":"bigint_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypessmall",
-                "tableCreateTime":1559151325
+                "tableCreateTime":1687531269
             }
         },
         {
@@ -1554,8 +1644,9 @@ where year=2009 and month=05
             "vertexType":"COLUMN",
             "vertexId":"float_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypessmall",
-                "tableCreateTime":1559151325
+                "tableCreateTime":1687531269
             }
         },
         {
@@ -1563,8 +1654,9 @@ where year=2009 and month=05
             "vertexType":"COLUMN",
             "vertexId":"double_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypessmall",
-                "tableCreateTime":1559151325
+                "tableCreateTime":1687531269
             }
         },
         {
@@ -1572,8 +1664,9 @@ where year=2009 and month=05
             "vertexType":"COLUMN",
             "vertexId":"date_string_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypessmall",
-                "tableCreateTime":1559151325
+                "tableCreateTime":1687531269
             }
         },
         {
@@ -1581,8 +1674,9 @@ where year=2009 and month=05
             "vertexType":"COLUMN",
             "vertexId":"string_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypessmall",
-                "tableCreateTime":1559151325
+                "tableCreateTime":1687531269
             }
         },
         {
@@ -1590,8 +1684,9 @@ where year=2009 and month=05
             "vertexType":"COLUMN",
             "vertexId":"timestamp_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypessmall",
-                "tableCreateTime":1559151325
+                "tableCreateTime":1687531269
             }
         },
         {
@@ -1599,8 +1694,9 @@ where year=2009 and month=05
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.month",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         },
         {
@@ -1608,8 +1704,9 @@ where year=2009 and month=05
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.year",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         }
     ]
@@ -1624,9 +1721,9 @@ where year=2009 and month>10
 {
     "queryText":"insert into table functional.alltypessmall (id, string_col, int_col)\npartition (year, month)\nselect id, string_col, int_col, year, month\nfrom functional_seq_snap.alltypes\nwhere year=2009 and month>10",
     "queryId":"0:0",
-    "hash":"39ac95ce0632ef1ee8b474be644971f3",
+    "hash":"adbda5f55e1de85c20b63ef02baa49b1",
     "user":"dummy_user",
-    "timestamp":1547867921,
+    "timestamp":1687551745,
     "edges":[
         {
             "sources":[
@@ -1766,8 +1863,9 @@ where year=2009 and month>10
             "vertexType":"COLUMN",
             "vertexId":"year",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypessmall",
-                "tableCreateTime":1559151325
+                "tableCreateTime":1687531269
             }
         },
         {
@@ -1775,8 +1873,9 @@ where year=2009 and month>10
             "vertexType":"COLUMN",
             "vertexId":"functional_seq_snap.alltypes.year",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional_seq_snap.alltypes",
-                "tableCreateTime":1559151137
+                "tableCreateTime":1687531272
             }
         },
         {
@@ -1784,8 +1883,9 @@ where year=2009 and month>10
             "vertexType":"COLUMN",
             "vertexId":"month",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypessmall",
-                "tableCreateTime":1559151325
+                "tableCreateTime":1687531269
             }
         },
         {
@@ -1793,8 +1893,9 @@ where year=2009 and month>10
             "vertexType":"COLUMN",
             "vertexId":"functional_seq_snap.alltypes.month",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional_seq_snap.alltypes",
-                "tableCreateTime":1559151137
+                "tableCreateTime":1687531272
             }
         },
         {
@@ -1802,8 +1903,9 @@ where year=2009 and month>10
             "vertexType":"COLUMN",
             "vertexId":"id",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypessmall",
-                "tableCreateTime":1559151325
+                "tableCreateTime":1687531269
             }
         },
         {
@@ -1811,8 +1913,9 @@ where year=2009 and month>10
             "vertexType":"COLUMN",
             "vertexId":"functional_seq_snap.alltypes.id",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional_seq_snap.alltypes",
-                "tableCreateTime":1559151137
+                "tableCreateTime":1687531272
             }
         },
         {
@@ -1820,8 +1923,9 @@ where year=2009 and month>10
             "vertexType":"COLUMN",
             "vertexId":"bool_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypessmall",
-                "tableCreateTime":1559151325
+                "tableCreateTime":1687531269
             }
         },
         {
@@ -1829,8 +1933,9 @@ where year=2009 and month>10
             "vertexType":"COLUMN",
             "vertexId":"tinyint_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypessmall",
-                "tableCreateTime":1559151325
+                "tableCreateTime":1687531269
             }
         },
         {
@@ -1838,8 +1943,9 @@ where year=2009 and month>10
             "vertexType":"COLUMN",
             "vertexId":"smallint_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypessmall",
-                "tableCreateTime":1559151325
+                "tableCreateTime":1687531269
             }
         },
         {
@@ -1847,8 +1953,9 @@ where year=2009 and month>10
             "vertexType":"COLUMN",
             "vertexId":"int_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypessmall",
-                "tableCreateTime":1559151325
+                "tableCreateTime":1687531269
             }
         },
         {
@@ -1856,8 +1963,9 @@ where year=2009 and month>10
             "vertexType":"COLUMN",
             "vertexId":"functional_seq_snap.alltypes.int_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional_seq_snap.alltypes",
-                "tableCreateTime":1559151137
+                "tableCreateTime":1687531272
             }
         },
         {
@@ -1865,8 +1973,9 @@ where year=2009 and month>10
             "vertexType":"COLUMN",
             "vertexId":"bigint_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypessmall",
-                "tableCreateTime":1559151325
+                "tableCreateTime":1687531269
             }
         },
         {
@@ -1874,8 +1983,9 @@ where year=2009 and month>10
             "vertexType":"COLUMN",
             "vertexId":"float_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypessmall",
-                "tableCreateTime":1559151325
+                "tableCreateTime":1687531269
             }
         },
         {
@@ -1883,8 +1993,9 @@ where year=2009 and month>10
             "vertexType":"COLUMN",
             "vertexId":"double_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypessmall",
-                "tableCreateTime":1559151325
+                "tableCreateTime":1687531269
             }
         },
         {
@@ -1892,8 +2003,9 @@ where year=2009 and month>10
             "vertexType":"COLUMN",
             "vertexId":"date_string_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypessmall",
-                "tableCreateTime":1559151325
+                "tableCreateTime":1687531269
             }
         },
         {
@@ -1901,8 +2013,9 @@ where year=2009 and month>10
             "vertexType":"COLUMN",
             "vertexId":"string_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypessmall",
-                "tableCreateTime":1559151325
+                "tableCreateTime":1687531269
             }
         },
         {
@@ -1910,8 +2023,9 @@ where year=2009 and month>10
             "vertexType":"COLUMN",
             "vertexId":"functional_seq_snap.alltypes.string_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional_seq_snap.alltypes",
-                "tableCreateTime":1559151137
+                "tableCreateTime":1687531272
             }
         },
         {
@@ -1919,8 +2033,9 @@ where year=2009 and month>10
             "vertexType":"COLUMN",
             "vertexId":"timestamp_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypessmall",
-                "tableCreateTime":1559151325
+                "tableCreateTime":1687531269
             }
         }
     ]
@@ -1939,9 +2054,9 @@ having min(id) > 10
 {
     "queryText":"insert into table functional.alltypessmall\npartition (year=2009, month)\nselect min(id), min(bool_col), min(tinyint_col), min(smallint_col), min(int_col),\nmin(bigint_col), min(float_col), min(double_col), min(date_string_col), min(string_col),\nmin(timestamp_col), month\nfrom functional.alltypes\nwhere year=2009 and month>10\ngroup by month\nhaving min(id) > 10",
     "queryId":"0:0",
-    "hash":"e6969c2cc67e9d6f3f985ddc6431f915",
+    "hash":"7059dbbaa22bdf0c2d4c5b08baf11ef2",
     "user":"dummy_user",
-    "timestamp":1547867921,
+    "timestamp":1687551745,
     "edges":[
         {
             "sources":[
@@ -2089,8 +2204,9 @@ having min(id) > 10
             "vertexType":"COLUMN",
             "vertexId":"year",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypessmall",
-                "tableCreateTime":1559151325
+                "tableCreateTime":1687531269
             }
         },
         {
@@ -2098,8 +2214,9 @@ having min(id) > 10
             "vertexType":"COLUMN",
             "vertexId":"month",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypessmall",
-                "tableCreateTime":1559151325
+                "tableCreateTime":1687531269
             }
         },
         {
@@ -2107,8 +2224,9 @@ having min(id) > 10
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.month",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         },
         {
@@ -2116,8 +2234,9 @@ having min(id) > 10
             "vertexType":"COLUMN",
             "vertexId":"id",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypessmall",
-                "tableCreateTime":1559151325
+                "tableCreateTime":1687531269
             }
         },
         {
@@ -2125,8 +2244,9 @@ having min(id) > 10
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.id",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         },
         {
@@ -2134,8 +2254,9 @@ having min(id) > 10
             "vertexType":"COLUMN",
             "vertexId":"bool_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypessmall",
-                "tableCreateTime":1559151325
+                "tableCreateTime":1687531269
             }
         },
         {
@@ -2143,8 +2264,9 @@ having min(id) > 10
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.bool_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         },
         {
@@ -2152,8 +2274,9 @@ having min(id) > 10
             "vertexType":"COLUMN",
             "vertexId":"tinyint_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypessmall",
-                "tableCreateTime":1559151325
+                "tableCreateTime":1687531269
             }
         },
         {
@@ -2161,8 +2284,9 @@ having min(id) > 10
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.tinyint_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         },
         {
@@ -2170,8 +2294,9 @@ having min(id) > 10
             "vertexType":"COLUMN",
             "vertexId":"smallint_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypessmall",
-                "tableCreateTime":1559151325
+                "tableCreateTime":1687531269
             }
         },
         {
@@ -2179,8 +2304,9 @@ having min(id) > 10
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.smallint_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         },
         {
@@ -2188,8 +2314,9 @@ having min(id) > 10
             "vertexType":"COLUMN",
             "vertexId":"int_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypessmall",
-                "tableCreateTime":1559151325
+                "tableCreateTime":1687531269
             }
         },
         {
@@ -2197,8 +2324,9 @@ having min(id) > 10
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.int_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         },
         {
@@ -2206,8 +2334,9 @@ having min(id) > 10
             "vertexType":"COLUMN",
             "vertexId":"bigint_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypessmall",
-                "tableCreateTime":1559151325
+                "tableCreateTime":1687531269
             }
         },
         {
@@ -2215,8 +2344,9 @@ having min(id) > 10
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.bigint_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         },
         {
@@ -2224,8 +2354,9 @@ having min(id) > 10
             "vertexType":"COLUMN",
             "vertexId":"float_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypessmall",
-                "tableCreateTime":1559151325
+                "tableCreateTime":1687531269
             }
         },
         {
@@ -2233,8 +2364,9 @@ having min(id) > 10
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.float_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         },
         {
@@ -2242,8 +2374,9 @@ having min(id) > 10
             "vertexType":"COLUMN",
             "vertexId":"double_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypessmall",
-                "tableCreateTime":1559151325
+                "tableCreateTime":1687531269
             }
         },
         {
@@ -2251,8 +2384,9 @@ having min(id) > 10
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.double_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         },
         {
@@ -2260,8 +2394,9 @@ having min(id) > 10
             "vertexType":"COLUMN",
             "vertexId":"date_string_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypessmall",
-                "tableCreateTime":1559151325
+                "tableCreateTime":1687531269
             }
         },
         {
@@ -2269,8 +2404,9 @@ having min(id) > 10
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.date_string_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         },
         {
@@ -2278,8 +2414,9 @@ having min(id) > 10
             "vertexType":"COLUMN",
             "vertexId":"string_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypessmall",
-                "tableCreateTime":1559151325
+                "tableCreateTime":1687531269
             }
         },
         {
@@ -2287,8 +2424,9 @@ having min(id) > 10
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.string_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         },
         {
@@ -2296,8 +2434,9 @@ having min(id) > 10
             "vertexType":"COLUMN",
             "vertexId":"timestamp_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypessmall",
-                "tableCreateTime":1559151325
+                "tableCreateTime":1687531269
             }
         },
         {
@@ -2305,8 +2444,9 @@ having min(id) > 10
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.timestamp_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         },
         {
@@ -2314,8 +2454,9 @@ having min(id) > 10
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.year",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         }
     ]
@@ -2330,9 +2471,9 @@ group by int_col, tinyint_col
 {
     "queryText":"select\nmax(tinyint_col) over(partition by int_col)\nfrom functional.alltypes\ngroup by int_col, tinyint_col",
     "queryId":"0:0",
-    "hash":"83c78528e6f5325c56a3f3521b08a78d",
+    "hash":"4de56e1b4b44d31bf3851fb46deed110",
     "user":"dummy_user",
-    "timestamp":1547867921,
+    "timestamp":1687551745,
     "edges":[
         {
             "sources":[
@@ -2364,8 +2505,9 @@ group by int_col, tinyint_col
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.tinyint_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         },
         {
@@ -2373,8 +2515,9 @@ group by int_col, tinyint_col
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.int_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         }
     ]
@@ -2385,9 +2528,9 @@ select int_col, rank() over(order by int_col) from functional.alltypesagg
 {
     "queryText":"select int_col, rank() over(order by int_col) from functional.alltypesagg",
     "queryId":"0:0",
-    "hash":"4f1ecaaed571d2ed9f09f091f399c311",
+    "hash":"6c646de10e62d1155b5216ae8589ff6d",
     "user":"dummy_user",
-    "timestamp":1547867921,
+    "timestamp":1687551745,
     "edges":[
         {
             "sources":[
@@ -2427,8 +2570,9 @@ select int_col, rank() over(order by int_col) from functional.alltypesagg
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypesagg.int_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypesagg",
-                "tableCreateTime":1559151363
+                "tableCreateTime":1687531275
             }
         },
         {
@@ -2447,9 +2591,9 @@ order by a.tinyint_col, a.int_col
 {
     "queryText":"select a.tinyint_col, a.int_col, count(a.double_col)\n  over(partition by a.tinyint_col order by a.int_col desc rows between 1 preceding and 1 following)\nfrom functional.alltypes a inner join functional.alltypessmall b on a.id = b.id\norder by a.tinyint_col, a.int_col",
     "queryId":"0:0",
-    "hash":"b6e26c00b2ef17f0592ebadb0ecc21f6",
+    "hash":"57958e2fb9f6dd0277f91593b59ed66e",
     "user":"dummy_user",
-    "timestamp":1547867921,
+    "timestamp":1687551745,
     "edges":[
         {
             "sources":[
@@ -2512,8 +2656,9 @@ order by a.tinyint_col, a.int_col
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.tinyint_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         },
         {
@@ -2526,8 +2671,9 @@ order by a.tinyint_col, a.int_col
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.int_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         },
         {
@@ -2540,8 +2686,9 @@ order by a.tinyint_col, a.int_col
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.double_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         },
         {
@@ -2549,8 +2696,9 @@ order by a.tinyint_col, a.int_col
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.id",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         },
         {
@@ -2558,8 +2706,9 @@ order by a.tinyint_col, a.int_col
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypessmall.id",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypessmall",
-                "tableCreateTime":1559151325
+                "tableCreateTime":1687531269
             }
         }
     ]
@@ -2578,9 +2727,9 @@ order by 2, 3, 4
 {
     "queryText":"with v2 as\n  (select\n   double_col,\n   count(int_col) over() a,\n   sum(int_col + bigint_col) over(partition by bool_col) b\n   from\n     (select * from functional.alltypes) v1)\nselect double_col, a, b, a + b, double_col + a from v2\norder by 2, 3, 4",
     "queryId":"0:0",
-    "hash":"6bf993cea0d1ab9e613674ef178916c9",
+    "hash":"94cd8f86dbdf00a40b9d935bccffcbaa",
     "user":"dummy_user",
-    "timestamp":1547867921,
+    "timestamp":1687551745,
     "edges":[
         {
             "sources":[
@@ -2660,8 +2809,9 @@ order by 2, 3, 4
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.double_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         },
         {
@@ -2674,8 +2824,9 @@ order by 2, 3, 4
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.int_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         },
         {
@@ -2688,8 +2839,9 @@ order by 2, 3, 4
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.bigint_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         },
         {
@@ -2697,8 +2849,9 @@ order by 2, 3, 4
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.bool_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         },
         {
@@ -2726,9 +2879,9 @@ order by 2, 3, 4
 {
     "queryText":"select double_col, a, b, a + b, double_col + a from\n  (select\n   double_col,\n   count(int_col) over() a,\n   sum(int_col + bigint_col) over(partition by bool_col) b\n   from\n     (select * from functional.alltypes) v1) v2\norder by 2, 3, 4",
     "queryId":"0:0",
-    "hash":"811403c86e86fe630dea7bd0a6c89273",
+    "hash":"4c67b7dddb64d9f584c1e6bd9e182fc6",
     "user":"dummy_user",
-    "timestamp":1547867921,
+    "timestamp":1687551745,
     "edges":[
         {
             "sources":[
@@ -2808,8 +2961,9 @@ order by 2, 3, 4
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.double_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         },
         {
@@ -2822,8 +2976,9 @@ order by 2, 3, 4
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.int_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         },
         {
@@ -2836,8 +2991,9 @@ order by 2, 3, 4
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.bigint_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         },
         {
@@ -2845,8 +3001,9 @@ order by 2, 3, 4
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.bool_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         },
         {
@@ -2876,9 +3033,9 @@ where b.month = 1
 {
     "queryText":"select a.month, a.year, b.int_col, b.month\nfrom\n  (select year, month from functional.alltypes\n   union all\n   select year, month from functional.alltypes) a\n  inner join\n  functional.alltypessmall b\n  on (a.month = b.month)\nwhere b.month = 1",
     "queryId":"0:0",
-    "hash":"e3000cd5edf2a02e1f5407810f3cc09a",
+    "hash":"6f38ebd361a51366f80a9f889f302424",
     "user":"dummy_user",
-    "timestamp":1547867922,
+    "timestamp":1687551745,
     "edges":[
         {
             "sources":[
@@ -2940,8 +3097,9 @@ where b.month = 1
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.month",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         },
         {
@@ -2954,8 +3112,9 @@ where b.month = 1
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.year",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         },
         {
@@ -2968,8 +3127,9 @@ where b.month = 1
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypessmall.int_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypessmall",
-                "tableCreateTime":1559151325
+                "tableCreateTime":1687531269
             }
         },
         {
@@ -2977,8 +3137,9 @@ where b.month = 1
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypessmall.month",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypessmall",
-                "tableCreateTime":1559151325
+                "tableCreateTime":1687531269
             }
         }
     ]
@@ -3000,9 +3161,9 @@ where month = 1
 {
     "queryText":"select t1.int_col, t2.month, t2.int_col + 1\nfrom (\n  select int_col, count(*)\n  from functional.alltypessmall\n  where month = 1\n  group by int_col\n  having count(*) > 1\n  order by count(*) desc limit 5\n  ) t1\njoin functional.alltypes t2 on (t1.int_col = t2.int_col)\nwhere month = 1",
     "queryId":"0:0",
-    "hash":"3f1ecf7239e205342aee4979e7cb4877",
+    "hash":"90ceff377b6984b0c3eb7306c3711b38",
     "user":"dummy_user",
-    "timestamp":1547867922,
+    "timestamp":1687551745,
     "edges":[
         {
             "sources":[
@@ -3057,8 +3218,9 @@ where month = 1
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypessmall.int_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypessmall",
-                "tableCreateTime":1559151325
+                "tableCreateTime":1687531269
             }
         },
         {
@@ -3071,8 +3233,9 @@ where month = 1
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.month",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         },
         {
@@ -3085,8 +3248,9 @@ where month = 1
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.int_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         },
         {
@@ -3094,8 +3258,9 @@ where month = 1
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypessmall.month",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypessmall",
-                "tableCreateTime":1559151325
+                "tableCreateTime":1687531269
             }
         }
     ]
@@ -3118,9 +3283,9 @@ and x.int_col + x.float_col + cast(c.string_col as float) < 1000
 {
     "queryText":"select x.smallint_col, x.id, x.tinyint_col, c.id, x.int_col, x.float_col, c.string_col\nfrom functional.alltypessmall c\njoin (\n   select a.smallint_col smallint_col, a.tinyint_col tinyint_col, a.day day,\n           a.int_col int_col, a.month month, b.float_col float_col, b.id id\n   from ( select * from functional.alltypesagg a where month=1 ) a\n   join functional.alltypessmall b on (a.smallint_col = b.id)\n ) x on (x.tinyint_col = c.id)\nwhere x.day=1\nand x.int_col [...]
     "queryId":"0:0",
-    "hash":"4edf165aed5982ede63f7c91074f4b44",
+    "hash":"154323930680f2bff235d4abcf5afa62",
     "user":"dummy_user",
-    "timestamp":1547867922,
+    "timestamp":1687551745,
     "edges":[
         {
             "sources":[
@@ -3218,8 +3383,9 @@ and x.int_col + x.float_col + cast(c.string_col as float) < 1000
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypesagg.smallint_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypesagg",
-                "tableCreateTime":1559151363
+                "tableCreateTime":1687531275
             }
         },
         {
@@ -3232,8 +3398,9 @@ and x.int_col + x.float_col + cast(c.string_col as float) < 1000
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypessmall.id",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypessmall",
-                "tableCreateTime":1559151325
+                "tableCreateTime":1687531269
             }
         },
         {
@@ -3246,8 +3413,9 @@ and x.int_col + x.float_col + cast(c.string_col as float) < 1000
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypesagg.tinyint_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypesagg",
-                "tableCreateTime":1559151363
+                "tableCreateTime":1687531275
             }
         },
         {
@@ -3260,8 +3428,9 @@ and x.int_col + x.float_col + cast(c.string_col as float) < 1000
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypesagg.int_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypesagg",
-                "tableCreateTime":1559151363
+                "tableCreateTime":1687531275
             }
         },
         {
@@ -3274,8 +3443,9 @@ and x.int_col + x.float_col + cast(c.string_col as float) < 1000
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypessmall.float_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypessmall",
-                "tableCreateTime":1559151325
+                "tableCreateTime":1687531269
             }
         },
         {
@@ -3288,8 +3458,9 @@ and x.int_col + x.float_col + cast(c.string_col as float) < 1000
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypessmall.string_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypessmall",
-                "tableCreateTime":1559151325
+                "tableCreateTime":1687531269
             }
         },
         {
@@ -3297,8 +3468,9 @@ and x.int_col + x.float_col + cast(c.string_col as float) < 1000
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypesagg.day",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypesagg",
-                "tableCreateTime":1559151363
+                "tableCreateTime":1687531275
             }
         },
         {
@@ -3306,8 +3478,9 @@ and x.int_col + x.float_col + cast(c.string_col as float) < 1000
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypesagg.month",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypesagg",
-                "tableCreateTime":1559151363
+                "tableCreateTime":1687531275
             }
         }
     ]
@@ -3327,9 +3500,9 @@ from
 {
     "queryText":"select c1, c2, c3\nfrom\n  (select c1, c2, c3\n   from\n     (select int_col c1, sum(float_col) c2, min(float_col) c3\n      from functional_hbase.alltypessmall\n      group by 1) x\n    order by 2,3 desc\n    limit 5\n) y",
     "queryId":"0:0",
-    "hash":"8b4d1ab11721d9ebdf26666d4195eb18",
+    "hash":"412ef8a4c54e66f19a0065c3fecc5c76",
     "user":"dummy_user",
-    "timestamp":1547867922,
+    "timestamp":1687551745,
     "edges":[
         {
             "sources":[
@@ -3382,8 +3555,9 @@ from
             "vertexType":"COLUMN",
             "vertexId":"functional_hbase.alltypessmall.int_col",
             "metadata":{
+                "tableType":"hbase",
                 "tableName":"functional_hbase.alltypessmall",
-                "tableCreateTime":1559151688
+                "tableCreateTime":1687531613
             }
         },
         {
@@ -3396,8 +3570,9 @@ from
             "vertexType":"COLUMN",
             "vertexId":"functional_hbase.alltypessmall.float_col",
             "metadata":{
+                "tableType":"hbase",
                 "tableName":"functional_hbase.alltypessmall",
-                "tableCreateTime":1559151688
+                "tableCreateTime":1687531613
             }
         },
         {
@@ -3429,9 +3604,9 @@ limit 0
 {
     "queryText":"select c1, x2\nfrom (\n  select c1, min(c2) x2\n  from (\n    select c1, c2, c3\n    from (\n      select int_col c1, tinyint_col c2, min(float_col) c3\n      from functional_hbase.alltypessmall\n      group by 1, 2\n      order by 1,2\n      limit 1\n    ) x\n  ) x2\n  group by c1\n) y\norder by 2,1 desc\nlimit 0",
     "queryId":"0:0",
-    "hash":"50d3b4f249f038b0711ea75c17640fc9",
+    "hash":"44626c1f89757d07604a3f054e98d67d",
     "user":"dummy_user",
-    "timestamp":1547867922,
+    "timestamp":1687551745,
     "edges":[
         {
             "sources":[
@@ -3474,8 +3649,9 @@ limit 0
             "vertexType":"COLUMN",
             "vertexId":"functional_hbase.alltypessmall.int_col",
             "metadata":{
+                "tableType":"hbase",
                 "tableName":"functional_hbase.alltypessmall",
-                "tableCreateTime":1559151688
+                "tableCreateTime":1687531613
             }
         },
         {
@@ -3488,8 +3664,9 @@ limit 0
             "vertexType":"COLUMN",
             "vertexId":"functional_hbase.alltypessmall.tinyint_col",
             "metadata":{
+                "tableType":"hbase",
                 "tableName":"functional_hbase.alltypessmall",
-                "tableCreateTime":1559151688
+                "tableCreateTime":1687531613
             }
         }
     ]
@@ -3501,9 +3678,9 @@ select int_col, string_col from functional.view_view
 {
     "queryText":"select int_col, string_col from functional.view_view",
     "queryId":"0:0",
-    "hash":"9073496459077de1332e5017977dedf5",
+    "hash":"05d4986bc7d30b32d8780d787af559d9",
     "user":"dummy_user",
-    "timestamp":1547867922,
+    "timestamp":1687551745,
     "edges":[
         {
             "sources":[
@@ -3535,8 +3712,9 @@ select int_col, string_col from functional.view_view
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.int_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         },
         {
@@ -3549,8 +3727,9 @@ select int_col, string_col from functional.view_view
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.string_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         }
     ]
@@ -3562,9 +3741,9 @@ where t.id < 10
 {
     "queryText":"select t.id from (select id from functional.alltypes_view) t\nwhere t.id < 10",
     "queryId":"0:0",
-    "hash":"8ba7998033f90e1e358f4fdc7ea4251b",
+    "hash":"0c505dc14adb7f037eea4b3c77c39bff",
     "user":"dummy_user",
-    "timestamp":1547867922,
+    "timestamp":1687551745,
     "edges":[
         {
             "sources":[
@@ -3596,8 +3775,9 @@ where t.id < 10
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.id",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         }
     ]
@@ -3612,9 +3792,9 @@ where id in
 {
     "queryText":"select string_col, float_col, bool_col\nfrom functional.alltypes\nwhere id in\n  (select id from functional.alltypesagg)",
     "queryId":"0:0",
-    "hash":"e8ad1371d2a13e1ee9ec45689b62cdc9",
+    "hash":"ae4a1b83a50d2ce727117d0387c8e098",
     "user":"dummy_user",
-    "timestamp":1547867922,
+    "timestamp":1687551745,
     "edges":[
         {
             "sources":[
@@ -3667,8 +3847,9 @@ where id in
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.string_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         },
         {
@@ -3681,8 +3862,9 @@ where id in
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.float_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         },
         {
@@ -3695,8 +3877,9 @@ where id in
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.bool_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         },
         {
@@ -3704,8 +3887,9 @@ where id in
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.id",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         },
         {
@@ -3713,8 +3897,9 @@ where id in
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypesagg.id",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypesagg",
-                "tableCreateTime":1559151363
+                "tableCreateTime":1687531275
             }
         }
     ]
@@ -3732,9 +3917,9 @@ and tinyint_col < 10
 {
     "queryText":"select 1\nfrom functional.alltypesagg a\nwhere exists\n  (select id, count(int_col) over (partition by bool_col)\n   from functional.alltypestiny b\n   where a.tinyint_col = b.tinyint_col\n   group by id, int_col, bool_col)\nand tinyint_col < 10",
     "queryId":"0:0",
-    "hash":"a7500c022d29c583c31b287868a848bf",
+    "hash":"ce3e78ae349dd67613458acb0dac572f",
     "user":"dummy_user",
-    "timestamp":1547867922,
+    "timestamp":1687551745,
     "edges":[
         {
             "sources":[
@@ -3766,8 +3951,9 @@ and tinyint_col < 10
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypesagg.tinyint_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypesagg",
-                "tableCreateTime":1559151363
+                "tableCreateTime":1687531275
             }
         },
         {
@@ -3775,8 +3961,9 @@ and tinyint_col < 10
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypestiny.tinyint_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypestiny",
-                "tableCreateTime":1559151330
+                "tableCreateTime":1687531270
             }
         }
     ]
@@ -3791,9 +3978,9 @@ and a.bigint_col > 10
 {
     "queryText":"select int_col + 1, tinyint_col - 1\nfrom functional.alltypes a\nwhere a.int_col <\n  (select max(int_col) from functional.alltypesagg g where g.bool_col = true)\nand a.bigint_col > 10",
     "queryId":"0:0",
-    "hash":"5e6227f323793ea4441e2a3119af2f09",
+    "hash":"2301fac73ccbb692c19615733c977c14",
     "user":"dummy_user",
-    "timestamp":1547867922,
+    "timestamp":1687551745,
     "edges":[
         {
             "sources":[
@@ -3838,8 +4025,9 @@ and a.bigint_col > 10
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.int_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         },
         {
@@ -3852,8 +4040,9 @@ and a.bigint_col > 10
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.tinyint_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         },
         {
@@ -3861,8 +4050,9 @@ and a.bigint_col > 10
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.bigint_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         },
         {
@@ -3870,8 +4060,9 @@ and a.bigint_col > 10
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypesagg.bool_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypesagg",
-                "tableCreateTime":1559151363
+                "tableCreateTime":1687531275
             }
         },
         {
@@ -3879,8 +4070,9 @@ and a.bigint_col > 10
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypesagg.int_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypesagg",
-                "tableCreateTime":1559151363
+                "tableCreateTime":1687531275
             }
         }
     ]
@@ -3892,9 +4084,9 @@ with t as (select int_col x, bigint_col y from functional.alltypes) select x, y
 {
     "queryText":"with t as (select int_col x, bigint_col y from functional.alltypes) select x, y from t",
     "queryId":"0:0",
-    "hash":"a7ab58d90540f28a8dfd69703632ad7a",
+    "hash":"ff421b2c2b249764028350613be74fb8",
     "user":"dummy_user",
-    "timestamp":1547867922,
+    "timestamp":1687551745,
     "edges":[
         {
             "sources":[
@@ -3926,8 +4118,9 @@ with t as (select int_col x, bigint_col y from functional.alltypes) select x, y
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.int_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         },
         {
@@ -3940,8 +4133,9 @@ with t as (select int_col x, bigint_col y from functional.alltypes) select x, y
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.bigint_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         }
     ]
@@ -3954,9 +4148,9 @@ select id, int_col, string_col, year, month from t1
 {
     "queryText":"with t1 as (select * from functional.alltypestiny)\ninsert into functional.alltypesinsert (id, int_col, string_col) partition(year, month)\nselect id, int_col, string_col, year, month from t1",
     "queryId":"0:0",
-    "hash":"0bc5b3e66cc72387f74893b1f1934946",
+    "hash":"0fa8fc72001bde1a8745956bccc77820",
     "user":"dummy_user",
-    "timestamp":1547867922,
+    "timestamp":1687551746,
     "edges":[
         {
             "sources":[
@@ -4074,8 +4268,9 @@ select id, int_col, string_col, year, month from t1
             "vertexType":"COLUMN",
             "vertexId":"year",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypesinsert",
-                "tableCreateTime":1559151331
+                "tableCreateTime":1687531270
             }
         },
         {
@@ -4083,8 +4278,9 @@ select id, int_col, string_col, year, month from t1
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypestiny.year",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypestiny",
-                "tableCreateTime":1559151330
+                "tableCreateTime":1687531270
             }
         },
         {
@@ -4092,8 +4288,9 @@ select id, int_col, string_col, year, month from t1
             "vertexType":"COLUMN",
             "vertexId":"month",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypesinsert",
-                "tableCreateTime":1559151331
+                "tableCreateTime":1687531270
             }
         },
         {
@@ -4101,8 +4298,9 @@ select id, int_col, string_col, year, month from t1
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypestiny.month",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypestiny",
-                "tableCreateTime":1559151330
+                "tableCreateTime":1687531270
             }
         },
         {
@@ -4110,8 +4308,9 @@ select id, int_col, string_col, year, month from t1
             "vertexType":"COLUMN",
             "vertexId":"id",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypesinsert",
-                "tableCreateTime":1559151331
+                "tableCreateTime":1687531270
             }
         },
         {
@@ -4119,8 +4318,9 @@ select id, int_col, string_col, year, month from t1
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypestiny.id",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypestiny",
-                "tableCreateTime":1559151330
+                "tableCreateTime":1687531270
             }
         },
         {
@@ -4128,8 +4328,9 @@ select id, int_col, string_col, year, month from t1
             "vertexType":"COLUMN",
             "vertexId":"bool_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypesinsert",
-                "tableCreateTime":1559151331
+                "tableCreateTime":1687531270
             }
         },
         {
@@ -4137,8 +4338,9 @@ select id, int_col, string_col, year, month from t1
             "vertexType":"COLUMN",
             "vertexId":"tinyint_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypesinsert",
-                "tableCreateTime":1559151331
+                "tableCreateTime":1687531270
             }
         },
         {
@@ -4146,8 +4348,9 @@ select id, int_col, string_col, year, month from t1
             "vertexType":"COLUMN",
             "vertexId":"smallint_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypesinsert",
-                "tableCreateTime":1559151331
+                "tableCreateTime":1687531270
             }
         },
         {
@@ -4155,8 +4358,9 @@ select id, int_col, string_col, year, month from t1
             "vertexType":"COLUMN",
             "vertexId":"int_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypesinsert",
-                "tableCreateTime":1559151331
+                "tableCreateTime":1687531270
             }
         },
         {
@@ -4164,8 +4368,9 @@ select id, int_col, string_col, year, month from t1
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypestiny.int_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypestiny",
-                "tableCreateTime":1559151330
+                "tableCreateTime":1687531270
             }
         },
         {
@@ -4173,8 +4378,9 @@ select id, int_col, string_col, year, month from t1
             "vertexType":"COLUMN",
             "vertexId":"bigint_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypesinsert",
-                "tableCreateTime":1559151331
+                "tableCreateTime":1687531270
             }
         },
         {
@@ -4182,8 +4388,9 @@ select id, int_col, string_col, year, month from t1
             "vertexType":"COLUMN",
             "vertexId":"float_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypesinsert",
-                "tableCreateTime":1559151331
+                "tableCreateTime":1687531270
             }
         },
         {
@@ -4191,8 +4398,9 @@ select id, int_col, string_col, year, month from t1
             "vertexType":"COLUMN",
             "vertexId":"double_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypesinsert",
-                "tableCreateTime":1559151331
+                "tableCreateTime":1687531270
             }
         },
         {
@@ -4200,8 +4408,9 @@ select id, int_col, string_col, year, month from t1
             "vertexType":"COLUMN",
             "vertexId":"date_string_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypesinsert",
-                "tableCreateTime":1559151331
+                "tableCreateTime":1687531270
             }
         },
         {
@@ -4209,8 +4418,9 @@ select id, int_col, string_col, year, month from t1
             "vertexType":"COLUMN",
             "vertexId":"string_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypesinsert",
-                "tableCreateTime":1559151331
+                "tableCreateTime":1687531270
             }
         },
         {
@@ -4218,8 +4428,9 @@ select id, int_col, string_col, year, month from t1
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypestiny.string_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypestiny",
-                "tableCreateTime":1559151330
+                "tableCreateTime":1687531270
             }
         },
         {
@@ -4227,8 +4438,9 @@ select id, int_col, string_col, year, month from t1
             "vertexType":"COLUMN",
             "vertexId":"timestamp_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypesinsert",
-                "tableCreateTime":1559151331
+                "tableCreateTime":1687531270
             }
         }
     ]
@@ -4245,9 +4457,9 @@ from
 {
     "queryText":"select lead(a) over (partition by b order by c)\nfrom\n  (select lead(id) over (partition by int_col order by bigint_col) as a,\n   max(id) over (partition by tinyint_col order by int_col) as b,\n   min(int_col) over (partition by string_col order by bool_col) as c\n   from functional.alltypes) v",
     "queryId":"0:0",
-    "hash":"aa95e5e6f39fc80bb3c318a2515dc77d",
+    "hash":"6891082bb252b6fce39d846bf89c497d",
     "user":"dummy_user",
-    "timestamp":1547867922,
+    "timestamp":1687551746,
     "edges":[
         {
             "sources":[
@@ -4284,8 +4496,9 @@ from
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.id",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         },
         {
@@ -4293,8 +4506,9 @@ from
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.bigint_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         },
         {
@@ -4302,8 +4516,9 @@ from
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.bool_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         },
         {
@@ -4311,8 +4526,9 @@ from
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.int_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         },
         {
@@ -4320,8 +4536,9 @@ from
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.string_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         },
         {
@@ -4329,8 +4546,9 @@ from
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.tinyint_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         }
     ]
@@ -4342,9 +4560,9 @@ create view test_view_lineage as select id from functional.alltypestiny
 {
     "queryText":"create view test_view_lineage as select id from functional.alltypestiny",
     "queryId":"0:0",
-    "hash":"ff6b1ecb265afe4f03355a07238cfe37",
+    "hash":"fd85383983eafa8a57731e87fba7b7b6",
     "user":"dummy_user",
-    "timestamp":1547867922,
+    "timestamp":1687551746,
     "edges":[
         {
             "sources":[
@@ -4362,6 +4580,7 @@ create view test_view_lineage as select id from functional.alltypestiny
             "vertexType":"COLUMN",
             "vertexId":"id",
             "metadata":{
+                "tableType":"view",
                 "tableName":"default.test_view_lineage",
                 "tableCreateTime":-1
             }
@@ -4371,8 +4590,9 @@ create view test_view_lineage as select id from functional.alltypestiny
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypestiny.id",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypestiny",
-                "tableCreateTime":1559151330
+                "tableCreateTime":1687531270
             }
         }
     ]
@@ -4400,9 +4620,9 @@ limit 0
 {
     "queryText":"create view test_view_lineage (a, b) as select c1, x2\nfrom (\n  select c1, min(c2) x2\n  from (\n    select c1, c2, c3\n    from (\n      select int_col c1, tinyint_col c2, min(float_col) c3\n      from functional_hbase.alltypessmall\n      group by 1, 2\n      order by 1,2\n      limit 1\n    ) x\n  ) x2\n  group by c1\n) y\norder by 2,1 desc\nlimit 0",
     "queryId":"0:0",
-    "hash":"b96adf892b897da1e562c5be98724fb5",
+    "hash":"a3cdac0fcdaef861d783d0ef91ad1919",
     "user":"dummy_user",
-    "timestamp":1547867922,
+    "timestamp":1687551746,
     "edges":[
         {
             "sources":[
@@ -4440,6 +4660,7 @@ limit 0
             "vertexType":"COLUMN",
             "vertexId":"a",
             "metadata":{
+                "tableType":"view",
                 "tableName":"default.test_view_lineage",
                 "tableCreateTime":-1
             }
@@ -4449,8 +4670,9 @@ limit 0
             "vertexType":"COLUMN",
             "vertexId":"functional_hbase.alltypessmall.int_col",
             "metadata":{
+                "tableType":"hbase",
                 "tableName":"functional_hbase.alltypessmall",
-                "tableCreateTime":1559151688
+                "tableCreateTime":1687531613
             }
         },
         {
@@ -4458,6 +4680,7 @@ limit 0
             "vertexType":"COLUMN",
             "vertexId":"b",
             "metadata":{
+                "tableType":"view",
                 "tableName":"default.test_view_lineage",
                 "tableCreateTime":-1
             }
@@ -4467,8 +4690,9 @@ limit 0
             "vertexType":"COLUMN",
             "vertexId":"functional_hbase.alltypessmall.tinyint_col",
             "metadata":{
+                "tableType":"hbase",
                 "tableName":"functional_hbase.alltypessmall",
-                "tableCreateTime":1559151688
+                "tableCreateTime":1687531613
             }
         }
     ]
@@ -4493,9 +4717,9 @@ create view test_view_lineage (a1, a2, a3, a4, a5, a6, a7) as
 {
     "queryText":"create view test_view_lineage (a1, a2, a3, a4, a5, a6, a7) as\n  select x.smallint_col, x.id, x.tinyint_col, c.id, x.int_col, x.float_col, c.string_col\n  from functional.alltypessmall c\n  join (\n     select a.smallint_col smallint_col, a.tinyint_col tinyint_col, a.day day,\n           a.int_col int_col, a.month month, b.float_col float_col, b.id id\n     from ( select * from functional.alltypesagg a where month=1 ) a\n     join functional.alltypessmall b on (a.smallin [...]
     "queryId":"0:0",
-    "hash":"ffbe643df8f26e92907fb45de1aeda36",
+    "hash":"687637d408bf427f7851f9dfafb4d637",
     "user":"dummy_user",
-    "timestamp":1547867922,
+    "timestamp":1687551746,
     "edges":[
         {
             "sources":[
@@ -4589,6 +4813,7 @@ create view test_view_lineage (a1, a2, a3, a4, a5, a6, a7) as
             "vertexType":"COLUMN",
             "vertexId":"a1",
             "metadata":{
+                "tableType":"view",
                 "tableName":"default.test_view_lineage",
                 "tableCreateTime":-1
             }
@@ -4598,8 +4823,9 @@ create view test_view_lineage (a1, a2, a3, a4, a5, a6, a7) as
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypesagg.smallint_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypesagg",
-                "tableCreateTime":1559151363
+                "tableCreateTime":1687531275
             }
         },
         {
@@ -4607,6 +4833,7 @@ create view test_view_lineage (a1, a2, a3, a4, a5, a6, a7) as
             "vertexType":"COLUMN",
             "vertexId":"a2",
             "metadata":{
+                "tableType":"view",
                 "tableName":"default.test_view_lineage",
                 "tableCreateTime":-1
             }
@@ -4616,8 +4843,9 @@ create view test_view_lineage (a1, a2, a3, a4, a5, a6, a7) as
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypessmall.id",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypessmall",
-                "tableCreateTime":1559151325
+                "tableCreateTime":1687531269
             }
         },
         {
@@ -4625,6 +4853,7 @@ create view test_view_lineage (a1, a2, a3, a4, a5, a6, a7) as
             "vertexType":"COLUMN",
             "vertexId":"a3",
             "metadata":{
+                "tableType":"view",
                 "tableName":"default.test_view_lineage",
                 "tableCreateTime":-1
             }
@@ -4634,8 +4863,9 @@ create view test_view_lineage (a1, a2, a3, a4, a5, a6, a7) as
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypesagg.tinyint_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypesagg",
-                "tableCreateTime":1559151363
+                "tableCreateTime":1687531275
             }
         },
         {
@@ -4643,6 +4873,7 @@ create view test_view_lineage (a1, a2, a3, a4, a5, a6, a7) as
             "vertexType":"COLUMN",
             "vertexId":"a4",
             "metadata":{
+                "tableType":"view",
                 "tableName":"default.test_view_lineage",
                 "tableCreateTime":-1
             }
@@ -4652,6 +4883,7 @@ create view test_view_lineage (a1, a2, a3, a4, a5, a6, a7) as
             "vertexType":"COLUMN",
             "vertexId":"a5",
             "metadata":{
+                "tableType":"view",
                 "tableName":"default.test_view_lineage",
                 "tableCreateTime":-1
             }
@@ -4661,8 +4893,9 @@ create view test_view_lineage (a1, a2, a3, a4, a5, a6, a7) as
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypesagg.int_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypesagg",
-                "tableCreateTime":1559151363
+                "tableCreateTime":1687531275
             }
         },
         {
@@ -4670,6 +4903,7 @@ create view test_view_lineage (a1, a2, a3, a4, a5, a6, a7) as
             "vertexType":"COLUMN",
             "vertexId":"a6",
             "metadata":{
+                "tableType":"view",
                 "tableName":"default.test_view_lineage",
                 "tableCreateTime":-1
             }
@@ -4679,8 +4913,9 @@ create view test_view_lineage (a1, a2, a3, a4, a5, a6, a7) as
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypessmall.float_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypessmall",
-                "tableCreateTime":1559151325
+                "tableCreateTime":1687531269
             }
         },
         {
@@ -4688,6 +4923,7 @@ create view test_view_lineage (a1, a2, a3, a4, a5, a6, a7) as
             "vertexType":"COLUMN",
             "vertexId":"a7",
             "metadata":{
+                "tableType":"view",
                 "tableName":"default.test_view_lineage",
                 "tableCreateTime":-1
             }
@@ -4697,8 +4933,9 @@ create view test_view_lineage (a1, a2, a3, a4, a5, a6, a7) as
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypessmall.string_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypessmall",
-                "tableCreateTime":1559151325
+                "tableCreateTime":1687531269
             }
         },
         {
@@ -4706,8 +4943,9 @@ create view test_view_lineage (a1, a2, a3, a4, a5, a6, a7) as
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypesagg.day",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypesagg",
-                "tableCreateTime":1559151363
+                "tableCreateTime":1687531275
             }
         },
         {
@@ -4715,8 +4953,9 @@ create view test_view_lineage (a1, a2, a3, a4, a5, a6, a7) as
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypesagg.month",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypesagg",
-                "tableCreateTime":1559151363
+                "tableCreateTime":1687531275
             }
         }
     ]
@@ -4736,9 +4975,9 @@ create view test_view_lineage as
 {
     "queryText":"create view test_view_lineage as\n  select * from (\n    select sum(a.tinyint_col) over (partition by a.smallint_col order by a.id),\n      count(b.string_col), b.timestamp_col\n    from functional.alltypes a join functional.alltypessmall b on (a.id = b.id)\n    where a.year = 2010 and b.float_col > 0\n    group by a.tinyint_col, a.smallint_col, a.id, b.string_col, b.timestamp_col, b.bigint_col\n    having count(a.int_col) > 10\n    order by b.bigint_col limit 10) t",
     "queryId":"0:0",
-    "hash":"d4b9e2d63548088f911816b2ae29d7c2",
+    "hash":"663b053e02a33d9bbd58ddc23ccbc101",
     "user":"dummy_user",
-    "timestamp":1547867922,
+    "timestamp":1687551746,
     "edges":[
         {
             "sources":[
@@ -4804,6 +5043,7 @@ create view test_view_lineage as
             "vertexType":"COLUMN",
             "vertexId":"_c0",
             "metadata":{
+                "tableType":"view",
                 "tableName":"default.test_view_lineage",
                 "tableCreateTime":-1
             }
@@ -4813,8 +5053,9 @@ create view test_view_lineage as
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.tinyint_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         },
         {
@@ -4822,8 +5063,9 @@ create view test_view_lineage as
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.id",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         },
         {
@@ -4831,8 +5073,9 @@ create view test_view_lineage as
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.smallint_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         },
         {
@@ -4840,6 +5083,7 @@ create view test_view_lineage as
             "vertexType":"COLUMN",
             "vertexId":"_c1",
             "metadata":{
+                "tableType":"view",
                 "tableName":"default.test_view_lineage",
                 "tableCreateTime":-1
             }
@@ -4849,8 +5093,9 @@ create view test_view_lineage as
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypessmall.string_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypessmall",
-                "tableCreateTime":1559151325
+                "tableCreateTime":1687531269
             }
         },
         {
@@ -4858,6 +5103,7 @@ create view test_view_lineage as
             "vertexType":"COLUMN",
             "vertexId":"timestamp_col",
             "metadata":{
+                "tableType":"view",
                 "tableName":"default.test_view_lineage",
                 "tableCreateTime":-1
             }
@@ -4867,8 +5113,9 @@ create view test_view_lineage as
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypessmall.timestamp_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypessmall",
-                "tableCreateTime":1559151325
+                "tableCreateTime":1687531269
             }
         },
         {
@@ -4876,8 +5123,9 @@ create view test_view_lineage as
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.int_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         },
         {
@@ -4885,8 +5133,9 @@ create view test_view_lineage as
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.year",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         },
         {
@@ -4894,8 +5143,9 @@ create view test_view_lineage as
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypessmall.bigint_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypessmall",
-                "tableCreateTime":1559151325
+                "tableCreateTime":1687531269
             }
         },
         {
@@ -4903,8 +5153,9 @@ create view test_view_lineage as
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypessmall.float_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypessmall",
-                "tableCreateTime":1559151325
+                "tableCreateTime":1687531269
             }
         },
         {
@@ -4912,8 +5163,9 @@ create view test_view_lineage as
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypessmall.id",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypessmall",
-                "tableCreateTime":1559151325
+                "tableCreateTime":1687531269
             }
         }
     ]
@@ -4925,9 +5177,9 @@ alter view functional.alltypes_view as select id from functional.alltypestiny
 {
     "queryText":"alter view functional.alltypes_view as select id from functional.alltypestiny",
     "queryId":"0:0",
-    "hash":"8c9367afc562a4c04d2d40e1276646c2",
+    "hash":"f12ecfd6e5357c92cbd14f52b2637e1a",
     "user":"dummy_user",
-    "timestamp":1547867922,
+    "timestamp":1687551746,
     "edges":[
         {
             "sources":[
@@ -4945,8 +5197,9 @@ alter view functional.alltypes_view as select id from functional.alltypestiny
             "vertexType":"COLUMN",
             "vertexId":"id",
             "metadata":{
+                "tableType":"view",
                 "tableName":"functional.alltypes_view",
-                "tableCreateTime":1559151386
+                "tableCreateTime":1687531280
             }
         },
         {
@@ -4954,8 +5207,9 @@ alter view functional.alltypes_view as select id from functional.alltypestiny
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypestiny.id",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypestiny",
-                "tableCreateTime":1559151330
+                "tableCreateTime":1687531270
             }
         }
     ]
@@ -4974,9 +5228,9 @@ select * from (
 {
     "queryText":"select * from (\n  select int_struct_col.f1 + int_struct_col.f2 x from functional.allcomplextypes\n  where year = 2000\n  order by nested_struct_col.f2.f12.f21 limit 10\n  union all\n  select sum(f1) y from\n    (select complex_struct_col.f1 f1 from functional.allcomplextypes\n     group by 1) v1) v2",
     "queryId":"0:0",
-    "hash":"4fb3ceddbf596097335af607d528f5a7",
+    "hash":"c32c80f6a02e5f11b920d658daa4a5c3",
     "user":"dummy_user",
-    "timestamp":1547867922,
+    "timestamp":1687551746,
     "edges":[
         {
             "sources":[
@@ -5011,8 +5265,9 @@ select * from (
             "vertexType":"COLUMN",
             "vertexId":"functional.allcomplextypes.complex_struct_col.f1",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.allcomplextypes",
-                "tableCreateTime":1559151373
+                "tableCreateTime":1687531278
             }
         },
         {
@@ -5020,8 +5275,9 @@ select * from (
             "vertexType":"COLUMN",
             "vertexId":"functional.allcomplextypes.int_struct_col.f1",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.allcomplextypes",
-                "tableCreateTime":1559151373
+                "tableCreateTime":1687531278
             }
         },
         {
@@ -5029,8 +5285,9 @@ select * from (
             "vertexType":"COLUMN",
             "vertexId":"functional.allcomplextypes.int_struct_col.f2",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.allcomplextypes",
-                "tableCreateTime":1559151373
+                "tableCreateTime":1687531278
             }
         },
         {
@@ -5038,8 +5295,9 @@ select * from (
             "vertexType":"COLUMN",
             "vertexId":"functional.allcomplextypes.nested_struct_col.f2.f12.f21",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.allcomplextypes",
-                "tableCreateTime":1559151373
+                "tableCreateTime":1687531278
             }
         },
         {
@@ -5047,8 +5305,9 @@ select * from (
             "vertexType":"COLUMN",
             "vertexId":"functional.allcomplextypes.year",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.allcomplextypes",
-                "tableCreateTime":1559151373
+                "tableCreateTime":1687531278
             }
         }
     ]
@@ -5062,9 +5321,9 @@ select * from functional.allcomplextypes.int_array_col a inner join
 {
     "queryText":"select * from functional.allcomplextypes.int_array_col a inner join\n  functional.allcomplextypes.struct_map_col m on (a.item = m.f1)",
     "queryId":"0:0",
-    "hash":"8c0c64f8a4c08b82ad343ab439101957",
+    "hash":"f0e1c9c0c94732cfb0e44792a1339d3e",
     "user":"dummy_user",
-    "timestamp":1547867922,
+    "timestamp":1687551746,
     "edges":[
         {
             "sources":[
@@ -5127,8 +5386,9 @@ select * from functional.allcomplextypes.int_array_col a inner join
             "vertexType":"COLUMN",
             "vertexId":"functional.allcomplextypes.int_array_col.item",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.allcomplextypes",
-                "tableCreateTime":1559151373
+                "tableCreateTime":1687531278
             }
         },
         {
@@ -5141,8 +5401,9 @@ select * from functional.allcomplextypes.int_array_col a inner join
             "vertexType":"COLUMN",
             "vertexId":"functional.allcomplextypes.struct_map_col.key",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.allcomplextypes",
-                "tableCreateTime":1559151373
+                "tableCreateTime":1687531278
             }
         },
         {
@@ -5155,8 +5416,9 @@ select * from functional.allcomplextypes.int_array_col a inner join
             "vertexType":"COLUMN",
             "vertexId":"functional.allcomplextypes.struct_map_col.value.f1",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.allcomplextypes",
-                "tableCreateTime":1559151373
+                "tableCreateTime":1687531278
             }
         },
         {
@@ -5169,8 +5431,9 @@ select * from functional.allcomplextypes.int_array_col a inner join
             "vertexType":"COLUMN",
             "vertexId":"functional.allcomplextypes.struct_map_col.value.f2",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.allcomplextypes",
-                "tableCreateTime":1559151373
+                "tableCreateTime":1687531278
             }
         }
     ]
@@ -5184,9 +5447,9 @@ select * from functional.allcomplextypes t, t.int_array_col a, t.struct_map_col
 {
     "queryText":"select * from functional.allcomplextypes t, t.int_array_col a, t.struct_map_col m\n  where a.item = m.f1",
     "queryId":"0:0",
-    "hash":"1b0db371b32e90d33629ed7779332cf7",
+    "hash":"58bf06d90d336cd80b24a2ea6404aa32",
     "user":"dummy_user",
-    "timestamp":1547867922,
+    "timestamp":1687551746,
     "edges":[
         {
             "sources":[
@@ -5281,8 +5544,9 @@ select * from functional.allcomplextypes t, t.int_array_col a, t.struct_map_col
             "vertexType":"COLUMN",
             "vertexId":"functional.allcomplextypes.id",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.allcomplextypes",
-                "tableCreateTime":1559151373
+                "tableCreateTime":1687531278
             }
         },
         {
@@ -5295,8 +5559,9 @@ select * from functional.allcomplextypes t, t.int_array_col a, t.struct_map_col
             "vertexType":"COLUMN",
             "vertexId":"functional.allcomplextypes.year",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.allcomplextypes",
-                "tableCreateTime":1559151373
+                "tableCreateTime":1687531278
             }
         },
         {
@@ -5309,8 +5574,9 @@ select * from functional.allcomplextypes t, t.int_array_col a, t.struct_map_col
             "vertexType":"COLUMN",
             "vertexId":"functional.allcomplextypes.month",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.allcomplextypes",
-                "tableCreateTime":1559151373
+                "tableCreateTime":1687531278
             }
         },
         {
@@ -5323,8 +5589,9 @@ select * from functional.allcomplextypes t, t.int_array_col a, t.struct_map_col
             "vertexType":"COLUMN",
             "vertexId":"functional.allcomplextypes.int_array_col.item",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.allcomplextypes",
-                "tableCreateTime":1559151373
+                "tableCreateTime":1687531278
             }
         },
         {
@@ -5337,8 +5604,9 @@ select * from functional.allcomplextypes t, t.int_array_col a, t.struct_map_col
             "vertexType":"COLUMN",
             "vertexId":"functional.allcomplextypes.struct_map_col.key",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.allcomplextypes",
-                "tableCreateTime":1559151373
+                "tableCreateTime":1687531278
             }
         },
         {
@@ -5351,8 +5619,9 @@ select * from functional.allcomplextypes t, t.int_array_col a, t.struct_map_col
             "vertexType":"COLUMN",
             "vertexId":"functional.allcomplextypes.struct_map_col.value.f1",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.allcomplextypes",
-                "tableCreateTime":1559151373
+                "tableCreateTime":1687531278
             }
         },
         {
@@ -5365,8 +5634,9 @@ select * from functional.allcomplextypes t, t.int_array_col a, t.struct_map_col
             "vertexType":"COLUMN",
             "vertexId":"functional.allcomplextypes.struct_map_col.value.f2",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.allcomplextypes",
-                "tableCreateTime":1559151373
+                "tableCreateTime":1687531278
             }
         },
         {
@@ -5374,8 +5644,9 @@ select * from functional.allcomplextypes t, t.int_array_col a, t.struct_map_col
             "vertexType":"COLUMN",
             "vertexId":"functional.allcomplextypes.int_array_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.allcomplextypes",
-                "tableCreateTime":1559151373
+                "tableCreateTime":1687531278
             }
         },
         {
@@ -5383,8 +5654,9 @@ select * from functional.allcomplextypes t, t.int_array_col a, t.struct_map_col
             "vertexType":"COLUMN",
             "vertexId":"functional.allcomplextypes.struct_map_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.allcomplextypes",
-                "tableCreateTime":1559151373
+                "tableCreateTime":1687531278
             }
         }
     ]
@@ -5405,9 +5677,9 @@ select a + b as ab, c, d, e from functional.allcomplextypes t,
 {
     "queryText":"select a + b as ab, c, d, e from functional.allcomplextypes t,\n  (select sum(item) a from t.int_array_col\n   where item < 10) v1,\n  (select count(f1) b from t.struct_map_col\n   group by key) v2,\n  (select avg(value) over(partition by key) c from t.map_map_col.value) v3,\n  (select item d from t.int_array_col\n   union all\n   select value from t.int_map_col) v4,\n  (select f21 e from t.complex_nested_struct_col.f2.f12 order by key limit 10) v5",
     "queryId":"0:0",
-    "hash":"4affc0d1e384475d1ff2fc2e19643064",
+    "hash":"17f8a4d5d7a82a254e377d2dd9f3ca66",
     "user":"dummy_user",
-    "timestamp":1547867922,
+    "timestamp":1687551746,
     "edges":[
         {
             "sources":[
@@ -5482,8 +5754,9 @@ select a + b as ab, c, d, e from functional.allcomplextypes t,
             "vertexType":"COLUMN",
             "vertexId":"functional.allcomplextypes.int_array_col.item",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.allcomplextypes",
-                "tableCreateTime":1559151373
+                "tableCreateTime":1687531278
             }
         },
         {
@@ -5491,8 +5764,9 @@ select a + b as ab, c, d, e from functional.allcomplextypes t,
             "vertexType":"COLUMN",
             "vertexId":"functional.allcomplextypes.struct_map_col.value.f1",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.allcomplextypes",
-                "tableCreateTime":1559151373
+                "tableCreateTime":1687531278
             }
         },
         {
@@ -5505,8 +5779,9 @@ select a + b as ab, c, d, e from functional.allcomplextypes t,
             "vertexType":"COLUMN",
             "vertexId":"functional.allcomplextypes.map_map_col.value.value",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.allcomplextypes",
-                "tableCreateTime":1559151373
+                "tableCreateTime":1687531278
             }
         },
         {
@@ -5514,8 +5789,9 @@ select a + b as ab, c, d, e from functional.allcomplextypes t,
             "vertexType":"COLUMN",
             "vertexId":"functional.allcomplextypes.map_map_col.value.key",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.allcomplextypes",
-                "tableCreateTime":1559151373
+                "tableCreateTime":1687531278
             }
         },
         {
@@ -5528,8 +5804,9 @@ select a + b as ab, c, d, e from functional.allcomplextypes t,
             "vertexType":"COLUMN",
             "vertexId":"functional.allcomplextypes.int_map_col.value",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.allcomplextypes",
-                "tableCreateTime":1559151373
+                "tableCreateTime":1687531278
             }
         },
         {
@@ -5542,8 +5819,9 @@ select a + b as ab, c, d, e from functional.allcomplextypes t,
             "vertexType":"COLUMN",
             "vertexId":"functional.allcomplextypes.complex_nested_struct_col.f2.item.f12.value.f21",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.allcomplextypes",
-                "tableCreateTime":1559151373
+                "tableCreateTime":1687531278
             }
         },
         {
@@ -5551,8 +5829,9 @@ select a + b as ab, c, d, e from functional.allcomplextypes t,
             "vertexType":"COLUMN",
             "vertexId":"functional.allcomplextypes.complex_nested_struct_col.f2.item.f12.key",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.allcomplextypes",
-                "tableCreateTime":1559151373
+                "tableCreateTime":1687531278
             }
         },
         {
@@ -5560,8 +5839,9 @@ select a + b as ab, c, d, e from functional.allcomplextypes t,
             "vertexType":"COLUMN",
             "vertexId":"functional.allcomplextypes.struct_map_col.key",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.allcomplextypes",
-                "tableCreateTime":1559151373
+                "tableCreateTime":1687531278
             }
         }
     ]
@@ -5575,9 +5855,9 @@ where not exists (select 1 from functional.alltypes a where v.id = a.id)
 {
     "queryText":"create view test_view_lineage as\nselect id from functional.alltypes_view v\nwhere not exists (select 1 from functional.alltypes a where v.id = a.id)",
     "queryId":"0:0",
-    "hash":"e79b8abc8a682d9e0f6b2c30a6c885f3",
+    "hash":"41a074680a8eedce05db55fde68669e0",
     "user":"dummy_user",
-    "timestamp":1547867922,
+    "timestamp":1687551746,
     "edges":[
         {
             "sources":[
@@ -5604,6 +5884,7 @@ where not exists (select 1 from functional.alltypes a where v.id = a.id)
             "vertexType":"COLUMN",
             "vertexId":"id",
             "metadata":{
+                "tableType":"view",
                 "tableName":"default.test_view_lineage",
                 "tableCreateTime":-1
             }
@@ -5613,8 +5894,9 @@ where not exists (select 1 from functional.alltypes a where v.id = a.id)
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.id",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         }
     ]
@@ -5627,9 +5909,9 @@ where k.int_col < 10
 {
     "queryText":"select count(*) from functional_kudu.alltypes k join functional.alltypes h on k.id = h.id\nwhere k.int_col < 10",
     "queryId":"0:0",
-    "hash":"7b7c92d488186d869bb6b78c97666f41",
+    "hash":"0528557b137722769f5df029d4816c7a",
     "user":"dummy_user",
-    "timestamp":1547867922,
+    "timestamp":1687551746,
     "edges":[
         {
             "sources":[
@@ -5662,8 +5944,9 @@ where k.int_col < 10
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.id",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         },
         {
@@ -5671,8 +5954,9 @@ where k.int_col < 10
             "vertexType":"COLUMN",
             "vertexId":"functional_kudu.alltypes.id",
             "metadata":{
+                "tableType":"kudu",
                 "tableName":"functional_kudu.alltypes",
-                "tableCreateTime":1559150985
+                "tableCreateTime":1687531210
             }
         },
         {
@@ -5680,8 +5964,9 @@ where k.int_col < 10
             "vertexType":"COLUMN",
             "vertexId":"functional_kudu.alltypes.int_col",
             "metadata":{
+                "tableType":"kudu",
                 "tableName":"functional_kudu.alltypes",
-                "tableCreateTime":1559150985
+                "tableCreateTime":1687531210
             }
         }
     ]
@@ -5694,9 +5979,9 @@ functional.alltypes a where a.id < 100
 {
     "queryText":"insert into functional_kudu.testtbl select id, string_col as name, int_col as zip from\nfunctional.alltypes a where a.id < 100",
     "queryId":"0:0",
-    "hash":"87a59bac56c6ad27f7af6e71af46d552",
+    "hash":"dd40a5127a7a1abe4708ac58811680ae",
     "user":"dummy_user",
-    "timestamp":1547867922,
+    "timestamp":1687551746,
     "edges":[
         {
             "sources":[
@@ -5743,8 +6028,9 @@ functional.alltypes a where a.id < 100
             "vertexType":"COLUMN",
             "vertexId":"id",
             "metadata":{
+                "tableType":"kudu",
                 "tableName":"functional_kudu.testtbl",
-                "tableCreateTime":1559151047
+                "tableCreateTime":1687531236
             }
         },
         {
@@ -5752,8 +6038,9 @@ functional.alltypes a where a.id < 100
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.id",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         },
         {
@@ -5761,8 +6048,9 @@ functional.alltypes a where a.id < 100
             "vertexType":"COLUMN",
             "vertexId":"name",
             "metadata":{
+                "tableType":"kudu",
                 "tableName":"functional_kudu.testtbl",
-                "tableCreateTime":1559151047
+                "tableCreateTime":1687531236
             }
         },
         {
@@ -5770,8 +6058,9 @@ functional.alltypes a where a.id < 100
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.string_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         },
         {
@@ -5779,8 +6068,9 @@ functional.alltypes a where a.id < 100
             "vertexType":"COLUMN",
             "vertexId":"zip",
             "metadata":{
+                "tableType":"kudu",
                 "tableName":"functional_kudu.testtbl",
-                "tableCreateTime":1559151047
+                "tableCreateTime":1687531236
             }
         },
         {
@@ -5788,8 +6078,9 @@ functional.alltypes a where a.id < 100
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.int_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         }
     ]
@@ -5802,9 +6093,9 @@ functional.alltypes where id < 10
 {
     "queryText":"insert into functional_kudu.testtbl (name, id) select string_col as name, id from\nfunctional.alltypes where id < 10",
     "queryId":"0:0",
-    "hash":"0bccfdbf4118e6d5a3d94062ecb5130a",
+    "hash":"111bc2413ac3bc54cdca8c0f0fc3cb8c",
     "user":"dummy_user",
-    "timestamp":1547867922,
+    "timestamp":1687551746,
     "edges":[
         {
             "sources":[
@@ -5841,8 +6132,9 @@ functional.alltypes where id < 10
             "vertexType":"COLUMN",
             "vertexId":"id",
             "metadata":{
+                "tableType":"kudu",
                 "tableName":"functional_kudu.testtbl",
-                "tableCreateTime":1559151047
+                "tableCreateTime":1687531236
             }
         },
         {
@@ -5850,8 +6142,9 @@ functional.alltypes where id < 10
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.id",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         },
         {
@@ -5859,8 +6152,9 @@ functional.alltypes where id < 10
             "vertexType":"COLUMN",
             "vertexId":"name",
             "metadata":{
+                "tableType":"kudu",
                 "tableName":"functional_kudu.testtbl",
-                "tableCreateTime":1559151047
+                "tableCreateTime":1687531236
             }
         },
         {
@@ -5868,8 +6162,9 @@ functional.alltypes where id < 10
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.string_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         }
     ]
@@ -5882,9 +6177,9 @@ functional.alltypes where id < 10
 {
     "queryText":"upsert into functional_kudu.testtbl (name, id) select string_col as name, id from\nfunctional.alltypes where id < 10",
     "queryId":"0:0",
-    "hash":"f4c1e7b016e75012f7268f2f42ae5630",
+    "hash":"848add05dd236efd79bffd369a0bdb69",
     "user":"dummy_user",
-    "timestamp":1547867922,
+    "timestamp":1687551746,
     "edges":[
         {
             "sources":[
@@ -5921,8 +6216,9 @@ functional.alltypes where id < 10
             "vertexType":"COLUMN",
             "vertexId":"id",
             "metadata":{
+                "tableType":"kudu",
                 "tableName":"functional_kudu.testtbl",
-                "tableCreateTime":1559151047
+                "tableCreateTime":1687531236
             }
         },
         {
@@ -5930,8 +6226,9 @@ functional.alltypes where id < 10
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.id",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         },
         {
@@ -5939,8 +6236,9 @@ functional.alltypes where id < 10
             "vertexType":"COLUMN",
             "vertexId":"name",
             "metadata":{
+                "tableType":"kudu",
                 "tableName":"functional_kudu.testtbl",
-                "tableCreateTime":1559151047
+                "tableCreateTime":1687531236
             }
         },
         {
@@ -5948,8 +6246,9 @@ functional.alltypes where id < 10
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypes.string_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypes",
-                "tableCreateTime":1559151317
+                "tableCreateTime":1687531267
             }
         }
     ]
@@ -5964,9 +6263,9 @@ from functional.alltypestiny
 {
     "queryText":"create table kudu_ctas primary key (id) partition by hash (id) partitions 3\nstored as kudu as select id, bool_col, tinyint_col, smallint_col, int_col,\nbigint_col, float_col, double_col, date_string_col, string_col\nfrom functional.alltypestiny",
     "queryId":"0:0",
-    "hash":"de98b09af6b6ab0f0678c5fc0c4369b4",
+    "hash":"1baf83a160e93356a7b12a393f147355",
     "user":"dummy_user",
-    "timestamp":1547867922,
+    "timestamp":1687551746,
     "edges":[
         {
             "sources":[
@@ -6065,6 +6364,7 @@ from functional.alltypestiny
             "vertexType":"COLUMN",
             "vertexId":"id",
             "metadata":{
+                "tableType":"kudu",
                 "tableName":"default.kudu_ctas",
                 "tableCreateTime":-1
             }
@@ -6074,8 +6374,9 @@ from functional.alltypestiny
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypestiny.id",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypestiny",
-                "tableCreateTime":1559151330
+                "tableCreateTime":1687531270
             }
         },
         {
@@ -6083,6 +6384,7 @@ from functional.alltypestiny
             "vertexType":"COLUMN",
             "vertexId":"bool_col",
             "metadata":{
+                "tableType":"kudu",
                 "tableName":"default.kudu_ctas",
                 "tableCreateTime":-1
             }
@@ -6092,8 +6394,9 @@ from functional.alltypestiny
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypestiny.bool_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypestiny",
-                "tableCreateTime":1559151330
+                "tableCreateTime":1687531270
             }
         },
         {
@@ -6101,6 +6404,7 @@ from functional.alltypestiny
             "vertexType":"COLUMN",
             "vertexId":"tinyint_col",
             "metadata":{
+                "tableType":"kudu",
                 "tableName":"default.kudu_ctas",
                 "tableCreateTime":-1
             }
@@ -6110,8 +6414,9 @@ from functional.alltypestiny
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypestiny.tinyint_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypestiny",
-                "tableCreateTime":1559151330
+                "tableCreateTime":1687531270
             }
         },
         {
@@ -6119,6 +6424,7 @@ from functional.alltypestiny
             "vertexType":"COLUMN",
             "vertexId":"smallint_col",
             "metadata":{
+                "tableType":"kudu",
                 "tableName":"default.kudu_ctas",
                 "tableCreateTime":-1
             }
@@ -6128,8 +6434,9 @@ from functional.alltypestiny
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypestiny.smallint_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypestiny",
-                "tableCreateTime":1559151330
+                "tableCreateTime":1687531270
             }
         },
         {
@@ -6137,6 +6444,7 @@ from functional.alltypestiny
             "vertexType":"COLUMN",
             "vertexId":"int_col",
             "metadata":{
+                "tableType":"kudu",
                 "tableName":"default.kudu_ctas",
                 "tableCreateTime":-1
             }
@@ -6146,8 +6454,9 @@ from functional.alltypestiny
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypestiny.int_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypestiny",
-                "tableCreateTime":1559151330
+                "tableCreateTime":1687531270
             }
         },
         {
@@ -6155,6 +6464,7 @@ from functional.alltypestiny
             "vertexType":"COLUMN",
             "vertexId":"bigint_col",
             "metadata":{
+                "tableType":"kudu",
                 "tableName":"default.kudu_ctas",
                 "tableCreateTime":-1
             }
@@ -6164,8 +6474,9 @@ from functional.alltypestiny
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypestiny.bigint_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypestiny",
-                "tableCreateTime":1559151330
+                "tableCreateTime":1687531270
             }
         },
         {
@@ -6173,6 +6484,7 @@ from functional.alltypestiny
             "vertexType":"COLUMN",
             "vertexId":"float_col",
             "metadata":{
+                "tableType":"kudu",
                 "tableName":"default.kudu_ctas",
                 "tableCreateTime":-1
             }
@@ -6182,8 +6494,9 @@ from functional.alltypestiny
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypestiny.float_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypestiny",
-                "tableCreateTime":1559151330
+                "tableCreateTime":1687531270
             }
         },
         {
@@ -6191,6 +6504,7 @@ from functional.alltypestiny
             "vertexType":"COLUMN",
             "vertexId":"double_col",
             "metadata":{
+                "tableType":"kudu",
                 "tableName":"default.kudu_ctas",
                 "tableCreateTime":-1
             }
@@ -6200,8 +6514,9 @@ from functional.alltypestiny
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypestiny.double_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypestiny",
-                "tableCreateTime":1559151330
+                "tableCreateTime":1687531270
             }
         },
         {
@@ -6209,6 +6524,7 @@ from functional.alltypestiny
             "vertexType":"COLUMN",
             "vertexId":"date_string_col",
             "metadata":{
+                "tableType":"kudu",
                 "tableName":"default.kudu_ctas",
                 "tableCreateTime":-1
             }
@@ -6218,8 +6534,9 @@ from functional.alltypestiny
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypestiny.date_string_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypestiny",
-                "tableCreateTime":1559151330
+                "tableCreateTime":1687531270
             }
         },
         {
@@ -6227,6 +6544,7 @@ from functional.alltypestiny
             "vertexType":"COLUMN",
             "vertexId":"string_col",
             "metadata":{
+                "tableType":"kudu",
                 "tableName":"default.kudu_ctas",
                 "tableCreateTime":-1
             }
@@ -6236,10 +6554,882 @@ from functional.alltypestiny
             "vertexType":"COLUMN",
             "vertexId":"functional.alltypestiny.string_col",
             "metadata":{
+                "tableType":"hive",
                 "tableName":"functional.alltypestiny",
-                "tableCreateTime":1559151330
+                "tableCreateTime":1687531270
             }
         }
     ]
 }
-====
\ No newline at end of file
+====
+# CTAS an Iceberg table from an HBase Table
+create table ice_ctas_from_hbase partitioned by spec (bucket(7,id))
+stored as iceberg as select id, bool_col, int_col,
+bigint_col, float_col, double_col, date_string_col, string_col
+from functional_hbase.alltypestiny
+---- LINEAGE
+{
+    "queryText":"create table ice_ctas_from_hbase partitioned by spec (bucket(7,id))\nstored as iceberg as select id, bool_col, int_col,\nbigint_col, float_col, double_col, date_string_col, string_col\nfrom functional_hbase.alltypestiny",
+    "queryId":"0:0",
+    "hash":"fc2031078e9801a8965cd81a415955d0",
+    "user":"dummy_user",
+    "timestamp":1687551746,
+    "edges":[
+        {
+            "sources":[
+                1
+            ],
+            "targets":[
+                0
+            ],
+            "edgeType":"PROJECTION"
+        },
+        {
+            "sources":[
+                3
+            ],
+            "targets":[
+                2
+            ],
+            "edgeType":"PROJECTION"
+        },
+        {
+            "sources":[
+                5
+            ],
+            "targets":[
+                4
+            ],
+            "edgeType":"PROJECTION"
+        },
+        {
+            "sources":[
+                7
+            ],
+            "targets":[
+                6
+            ],
+            "edgeType":"PROJECTION"
+        },
+        {
+            "sources":[
+                9
+            ],
+            "targets":[
+                8
+            ],
+            "edgeType":"PROJECTION"
+        },
+        {
+            "sources":[
+                11
+            ],
+            "targets":[
+                10
+            ],
+            "edgeType":"PROJECTION"
+        },
+        {
+            "sources":[
+                13
+            ],
+            "targets":[
+                12
+            ],
+            "edgeType":"PROJECTION"
+        },
+        {
+            "sources":[
+                15
+            ],
+            "targets":[
+                14
+            ],
+            "edgeType":"PROJECTION"
+        }
+    ],
+    "vertices":[
+        {
+            "id":0,
+            "vertexType":"COLUMN",
+            "vertexId":"id",
+            "metadata":{
+                "tableType":"iceberg",
+                "tableName":"default.ice_ctas_from_hbase",
+                "tableCreateTime":-1
+            }
+        },
+        {
+            "id":1,
+            "vertexType":"COLUMN",
+            "vertexId":"functional_hbase.alltypestiny.id",
+            "metadata":{
+                "tableType":"hbase",
+                "tableName":"functional_hbase.alltypestiny",
+                "tableCreateTime":1687531613
+            }
+        },
+        {
+            "id":2,
+            "vertexType":"COLUMN",
+            "vertexId":"bool_col",
+            "metadata":{
+                "tableType":"iceberg",
+                "tableName":"default.ice_ctas_from_hbase",
+                "tableCreateTime":-1
+            }
+        },
+        {
+            "id":3,
+            "vertexType":"COLUMN",
+            "vertexId":"functional_hbase.alltypestiny.bool_col",
+            "metadata":{
+                "tableType":"hbase",
+                "tableName":"functional_hbase.alltypestiny",
+                "tableCreateTime":1687531613
+            }
+        },
+        {
+            "id":4,
+            "vertexType":"COLUMN",
+            "vertexId":"int_col",
+            "metadata":{
+                "tableType":"iceberg",
+                "tableName":"default.ice_ctas_from_hbase",
+                "tableCreateTime":-1
+            }
+        },
+        {
+            "id":5,
+            "vertexType":"COLUMN",
+            "vertexId":"functional_hbase.alltypestiny.int_col",
+            "metadata":{
+                "tableType":"hbase",
+                "tableName":"functional_hbase.alltypestiny",
+                "tableCreateTime":1687531613
+            }
+        },
+        {
+            "id":6,
+            "vertexType":"COLUMN",
+            "vertexId":"bigint_col",
+            "metadata":{
+                "tableType":"iceberg",
+                "tableName":"default.ice_ctas_from_hbase",
+                "tableCreateTime":-1
+            }
+        },
+        {
+            "id":7,
+            "vertexType":"COLUMN",
+            "vertexId":"functional_hbase.alltypestiny.bigint_col",
+            "metadata":{
+                "tableType":"hbase",
+                "tableName":"functional_hbase.alltypestiny",
+                "tableCreateTime":1687531613
+            }
+        },
+        {
+            "id":8,
+            "vertexType":"COLUMN",
+            "vertexId":"float_col",
+            "metadata":{
+                "tableType":"iceberg",
+                "tableName":"default.ice_ctas_from_hbase",
+                "tableCreateTime":-1
+            }
+        },
+        {
+            "id":9,
+            "vertexType":"COLUMN",
+            "vertexId":"functional_hbase.alltypestiny.float_col",
+            "metadata":{
+                "tableType":"hbase",
+                "tableName":"functional_hbase.alltypestiny",
+                "tableCreateTime":1687531613
+            }
+        },
+        {
+            "id":10,
+            "vertexType":"COLUMN",
+            "vertexId":"double_col",
+            "metadata":{
+                "tableType":"iceberg",
+                "tableName":"default.ice_ctas_from_hbase",
+                "tableCreateTime":-1
+            }
+        },
+        {
+            "id":11,
+            "vertexType":"COLUMN",
+            "vertexId":"functional_hbase.alltypestiny.double_col",
+            "metadata":{
+                "tableType":"hbase",
+                "tableName":"functional_hbase.alltypestiny",
+                "tableCreateTime":1687531613
+            }
+        },
+        {
+            "id":12,
+            "vertexType":"COLUMN",
+            "vertexId":"date_string_col",
+            "metadata":{
+                "tableType":"iceberg",
+                "tableName":"default.ice_ctas_from_hbase",
+                "tableCreateTime":-1
+            }
+        },
+        {
+            "id":13,
+            "vertexType":"COLUMN",
+            "vertexId":"functional_hbase.alltypestiny.date_string_col",
+            "metadata":{
+                "tableType":"hbase",
+                "tableName":"functional_hbase.alltypestiny",
+                "tableCreateTime":1687531613
+            }
+        },
+        {
+            "id":14,
+            "vertexType":"COLUMN",
+            "vertexId":"string_col",
+            "metadata":{
+                "tableType":"iceberg",
+                "tableName":"default.ice_ctas_from_hbase",
+                "tableCreateTime":-1
+            }
+        },
+        {
+            "id":15,
+            "vertexType":"COLUMN",
+            "vertexId":"functional_hbase.alltypestiny.string_col",
+            "metadata":{
+                "tableType":"hbase",
+                "tableName":"functional_hbase.alltypestiny",
+                "tableCreateTime":1687531613
+            }
+        }
+    ]
+}
+====
+# CTAS an Iceberg table from an Kudu Table
+create table ice_ctas_from_kudu partitioned by spec (truncate(100, id))
+stored as iceberg as select id, bool_col, int_col,
+bigint_col, float_col, double_col, date_string_col, string_col
+from functional_kudu.alltypestiny
+---- LINEAGE
+{
+    "queryText":"create table ice_ctas_from_kudu partitioned by spec (truncate(100, id))\nstored as iceberg as select id, bool_col, int_col,\nbigint_col, float_col, double_col, date_string_col, string_col\nfrom functional_kudu.alltypestiny",
+    "queryId":"0:0",
+    "hash":"5f8edff98099449082049dda676428b0",
+    "user":"dummy_user",
+    "timestamp":1687551747,
+    "edges":[
+        {
+            "sources":[
+                1
+            ],
+            "targets":[
+                0
+            ],
+            "edgeType":"PROJECTION"
+        },
+        {
+            "sources":[
+                3
+            ],
+            "targets":[
+                2
+            ],
+            "edgeType":"PROJECTION"
+        },
+        {
+            "sources":[
+                5
+            ],
+            "targets":[
+                4
+            ],
+            "edgeType":"PROJECTION"
+        },
+        {
+            "sources":[
+                7
+            ],
+            "targets":[
+                6
+            ],
+            "edgeType":"PROJECTION"
+        },
+        {
+            "sources":[
+                9
+            ],
+            "targets":[
+                8
+            ],
+            "edgeType":"PROJECTION"
+        },
+        {
+            "sources":[
+                11
+            ],
+            "targets":[
+                10
+            ],
+            "edgeType":"PROJECTION"
+        },
+        {
+            "sources":[
+                13
+            ],
+            "targets":[
+                12
+            ],
+            "edgeType":"PROJECTION"
+        },
+        {
+            "sources":[
+                15
+            ],
+            "targets":[
+                14
+            ],
+            "edgeType":"PROJECTION"
+        }
+    ],
+    "vertices":[
+        {
+            "id":0,
+            "vertexType":"COLUMN",
+            "vertexId":"id",
+            "metadata":{
+                "tableType":"iceberg",
+                "tableName":"default.ice_ctas_from_kudu",
+                "tableCreateTime":-1
+            }
+        },
+        {
+            "id":1,
+            "vertexType":"COLUMN",
+            "vertexId":"functional_kudu.alltypestiny.id",
+            "metadata":{
+                "tableType":"kudu",
+                "tableName":"functional_kudu.alltypestiny",
+                "tableCreateTime":1687531219
+            }
+        },
+        {
+            "id":2,
+            "vertexType":"COLUMN",
+            "vertexId":"bool_col",
+            "metadata":{
+                "tableType":"iceberg",
+                "tableName":"default.ice_ctas_from_kudu",
+                "tableCreateTime":-1
+            }
+        },
+        {
+            "id":3,
+            "vertexType":"COLUMN",
+            "vertexId":"functional_kudu.alltypestiny.bool_col",
+            "metadata":{
+                "tableType":"kudu",
+                "tableName":"functional_kudu.alltypestiny",
+                "tableCreateTime":1687531219
+            }
+        },
+        {
+            "id":4,
+            "vertexType":"COLUMN",
+            "vertexId":"int_col",
+            "metadata":{
+                "tableType":"iceberg",
+                "tableName":"default.ice_ctas_from_kudu",
+                "tableCreateTime":-1
+            }
+        },
+        {
+            "id":5,
+            "vertexType":"COLUMN",
+            "vertexId":"functional_kudu.alltypestiny.int_col",
+            "metadata":{
+                "tableType":"kudu",
+                "tableName":"functional_kudu.alltypestiny",
+                "tableCreateTime":1687531219
+            }
+        },
+        {
+            "id":6,
+            "vertexType":"COLUMN",
+            "vertexId":"bigint_col",
+            "metadata":{
+                "tableType":"iceberg",
+                "tableName":"default.ice_ctas_from_kudu",
+                "tableCreateTime":-1
+            }
+        },
+        {
+            "id":7,
+            "vertexType":"COLUMN",
+            "vertexId":"functional_kudu.alltypestiny.bigint_col",
+            "metadata":{
+                "tableType":"kudu",
+                "tableName":"functional_kudu.alltypestiny",
+                "tableCreateTime":1687531219
+            }
+        },
+        {
+            "id":8,
+            "vertexType":"COLUMN",
+            "vertexId":"float_col",
+            "metadata":{
+                "tableType":"iceberg",
+                "tableName":"default.ice_ctas_from_kudu",
+                "tableCreateTime":-1
+            }
+        },
+        {
+            "id":9,
+            "vertexType":"COLUMN",
+            "vertexId":"functional_kudu.alltypestiny.float_col",
+            "metadata":{
+                "tableType":"kudu",
+                "tableName":"functional_kudu.alltypestiny",
+                "tableCreateTime":1687531219
+            }
+        },
+        {
+            "id":10,
+            "vertexType":"COLUMN",
+            "vertexId":"double_col",
+            "metadata":{
+                "tableType":"iceberg",
+                "tableName":"default.ice_ctas_from_kudu",
+                "tableCreateTime":-1
+            }
+        },
+        {
+            "id":11,
+            "vertexType":"COLUMN",
+            "vertexId":"functional_kudu.alltypestiny.double_col",
+            "metadata":{
+                "tableType":"kudu",
+                "tableName":"functional_kudu.alltypestiny",
+                "tableCreateTime":1687531219
+            }
+        },
+        {
+            "id":12,
+            "vertexType":"COLUMN",
+            "vertexId":"date_string_col",
+            "metadata":{
+                "tableType":"iceberg",
+                "tableName":"default.ice_ctas_from_kudu",
+                "tableCreateTime":-1
+            }
+        },
+        {
+            "id":13,
+            "vertexType":"COLUMN",
+            "vertexId":"functional_kudu.alltypestiny.date_string_col",
+            "metadata":{
+                "tableType":"kudu",
+                "tableName":"functional_kudu.alltypestiny",
+                "tableCreateTime":1687531219
+            }
+        },
+        {
+            "id":14,
+            "vertexType":"COLUMN",
+            "vertexId":"string_col",
+            "metadata":{
+                "tableType":"iceberg",
+                "tableName":"default.ice_ctas_from_kudu",
+                "tableCreateTime":-1
+            }
+        },
+        {
+            "id":15,
+            "vertexType":"COLUMN",
+            "vertexId":"functional_kudu.alltypestiny.string_col",
+            "metadata":{
+                "tableType":"kudu",
+                "tableName":"functional_kudu.alltypestiny",
+                "tableCreateTime":1687531219
+            }
+        }
+    ]
+}
+====
+# INSERT INTO Iceberg table FROM Kudu table
+INSERT INTO functional_parquet.iceberg_alltypes_part SELECT id, bool_col, int_col,
+bigint_col, float_col, double_col, 3.14, cast(date_string_col as date format 'MM/DD/YYYY'),
+string_col from functional_kudu.alltypestiny
+---- LINEAGE
+{
+    "queryText":"INSERT INTO functional_parquet.iceberg_alltypes_part SELECT id, bool_col, int_col,\nbigint_col, float_col, double_col, 3.14, cast(date_string_col as date format 'MM/DD/YYYY'),\nstring_col from functional_kudu.alltypestiny",
+    "queryId":"0:0",
+    "hash":"58cca98fbd61b04a38cce3c6d33db56d",
+    "user":"dummy_user",
+    "timestamp":1687553401,
+    "edges":[
+        {
+            "sources":[
+                1
+            ],
+            "targets":[
+                0
+            ],
+            "edgeType":"PROJECTION"
+        },
+        {
+            "sources":[
+                3
+            ],
+            "targets":[
+                2
+            ],
+            "edgeType":"PROJECTION"
+        },
+        {
+            "sources":[
+                5
+            ],
+            "targets":[
+                4
+            ],
+            "edgeType":"PROJECTION"
+        },
+        {
+            "sources":[
+                7
+            ],
+            "targets":[
+                6
+            ],
+            "edgeType":"PROJECTION"
+        },
+        {
+            "sources":[
+                9
+            ],
+            "targets":[
+                8
+            ],
+            "edgeType":"PROJECTION"
+        },
+        {
+            "sources":[
+                11
+            ],
+            "targets":[
+                10
+            ],
+            "edgeType":"PROJECTION"
+        },
+        {
+            "sources":[
+            ],
+            "targets":[
+                12
+            ],
+            "edgeType":"PROJECTION"
+        },
+        {
+            "sources":[
+                14
+            ],
+            "targets":[
+                13
+            ],
+            "edgeType":"PROJECTION"
+        },
+        {
+            "sources":[
+                16
+            ],
+            "targets":[
+                15
+            ],
+            "edgeType":"PROJECTION"
+        }
+    ],
+    "vertices":[
+        {
+            "id":0,
+            "vertexType":"COLUMN",
+            "vertexId":"i",
+            "metadata":{
+                "tableType":"iceberg",
+                "tableName":"functional_parquet.iceberg_alltypes_part",
+                "tableCreateTime":1687531277
+            }
+        },
+        {
+            "id":1,
+            "vertexType":"COLUMN",
+            "vertexId":"functional_kudu.alltypestiny.id",
+            "metadata":{
+                "tableType":"kudu",
+                "tableName":"functional_kudu.alltypestiny",
+                "tableCreateTime":1687531219
+            }
+        },
+        {
+            "id":2,
+            "vertexType":"COLUMN",
+            "vertexId":"p_bool",
+            "metadata":{
+                "tableType":"iceberg",
+                "tableName":"functional_parquet.iceberg_alltypes_part",
+                "tableCreateTime":1687531277
+            }
+        },
+        {
+            "id":3,
+            "vertexType":"COLUMN",
+            "vertexId":"functional_kudu.alltypestiny.bool_col",
+            "metadata":{
+                "tableType":"kudu",
+                "tableName":"functional_kudu.alltypestiny",
+                "tableCreateTime":1687531219
+            }
+        },
+        {
+            "id":4,
+            "vertexType":"COLUMN",
+            "vertexId":"p_int",
+            "metadata":{
+                "tableType":"iceberg",
+                "tableName":"functional_parquet.iceberg_alltypes_part",
+                "tableCreateTime":1687531277
+            }
+        },
+        {
+            "id":5,
+            "vertexType":"COLUMN",
+            "vertexId":"functional_kudu.alltypestiny.int_col",
+            "metadata":{
+                "tableType":"kudu",
+                "tableName":"functional_kudu.alltypestiny",
+                "tableCreateTime":1687531219
+            }
+        },
+        {
+            "id":6,
+            "vertexType":"COLUMN",
+            "vertexId":"p_bigint",
+            "metadata":{
+                "tableType":"iceberg",
+                "tableName":"functional_parquet.iceberg_alltypes_part",
+                "tableCreateTime":1687531277
+            }
+        },
+        {
+            "id":7,
+            "vertexType":"COLUMN",
+            "vertexId":"functional_kudu.alltypestiny.bigint_col",
+            "metadata":{
+                "tableType":"kudu",
+                "tableName":"functional_kudu.alltypestiny",
+                "tableCreateTime":1687531219
+            }
+        },
+        {
+            "id":8,
+            "vertexType":"COLUMN",
+            "vertexId":"p_float",
+            "metadata":{
+                "tableType":"iceberg",
+                "tableName":"functional_parquet.iceberg_alltypes_part",
+                "tableCreateTime":1687531277
+            }
+        },
+        {
+            "id":9,
+            "vertexType":"COLUMN",
+            "vertexId":"functional_kudu.alltypestiny.float_col",
+            "metadata":{
+                "tableType":"kudu",
+                "tableName":"functional_kudu.alltypestiny",
+                "tableCreateTime":1687531219
+            }
+        },
+        {
+            "id":10,
+            "vertexType":"COLUMN",
+            "vertexId":"p_double",
+            "metadata":{
+                "tableType":"iceberg",
+                "tableName":"functional_parquet.iceberg_alltypes_part",
+                "tableCreateTime":1687531277
+            }
+        },
+        {
+            "id":11,
+            "vertexType":"COLUMN",
+            "vertexId":"functional_kudu.alltypestiny.double_col",
+            "metadata":{
+                "tableType":"kudu",
+                "tableName":"functional_kudu.alltypestiny",
+                "tableCreateTime":1687531219
+            }
+        },
+        {
+            "id":12,
+            "vertexType":"COLUMN",
+            "vertexId":"p_decimal",
+            "metadata":{
+                "tableType":"iceberg",
+                "tableName":"functional_parquet.iceberg_alltypes_part",
+                "tableCreateTime":1687531277
+            }
+        },
+        {
+            "id":13,
+            "vertexType":"COLUMN",
+            "vertexId":"p_date",
+            "metadata":{
+                "tableType":"iceberg",
+                "tableName":"functional_parquet.iceberg_alltypes_part",
+                "tableCreateTime":1687531277
+            }
+        },
+        {
+            "id":14,
+            "vertexType":"COLUMN",
+            "vertexId":"functional_kudu.alltypestiny.date_string_col",
+            "metadata":{
+                "tableType":"kudu",
+                "tableName":"functional_kudu.alltypestiny",
+                "tableCreateTime":1687531219
+            }
+        },
+        {
+            "id":15,
+            "vertexType":"COLUMN",
+            "vertexId":"p_string",
+            "metadata":{
+                "tableType":"iceberg",
+                "tableName":"functional_parquet.iceberg_alltypes_part",
+                "tableCreateTime":1687531277
+            }
+        },
+        {
+            "id":16,
+            "vertexType":"COLUMN",
+            "vertexId":"functional_kudu.alltypestiny.string_col",
+            "metadata":{
+                "tableType":"kudu",
+                "tableName":"functional_kudu.alltypestiny",
+                "tableCreateTime":1687531219
+            }
+        }
+    ]
+}
+====
+# INSERT INTO Kudu table FROM Iceberg table
+insert into functional_kudu.testtbl select id, user as name, cast(id*2 as INT) as zip
+from functional_parquet.iceberg_partitioned a where a.id < 100
+---- LINEAGE
+{
+    "queryText":"insert into functional_kudu.testtbl select id, user as name, cast(id*2 as INT) as zip\nfrom functional_parquet.iceberg_partitioned a where a.id < 100",
+    "queryId":"0:0",
+    "hash":"e1c26e3c7ec88ea6ffe339402631655b",
+    "user":"dummy_user",
+    "timestamp":1687553401,
+    "edges":[
+        {
+            "sources":[
+                1
+            ],
+            "targets":[
+                0
+            ],
+            "edgeType":"PROJECTION"
+        },
+        {
+            "sources":[
+                3
+            ],
+            "targets":[
+                2
+            ],
+            "edgeType":"PROJECTION"
+        },
+        {
+            "sources":[
+                1
+            ],
+            "targets":[
+                4
+            ],
+            "edgeType":"PROJECTION"
+        },
+        {
+            "sources":[
+                1
+            ],
+            "targets":[
+                0,
+                2,
+                4
+            ],
+            "edgeType":"PREDICATE"
+        }
+    ],
+    "vertices":[
+        {
+            "id":0,
+            "vertexType":"COLUMN",
+            "vertexId":"id",
+            "metadata":{
+                "tableType":"kudu",
+                "tableName":"functional_kudu.testtbl",
+                "tableCreateTime":1687531236
+            }
+        },
+        {
+            "id":1,
+            "vertexType":"COLUMN",
+            "vertexId":"functional_parquet.iceberg_partitioned.id",
+            "metadata":{
+                "tableType":"iceberg",
+                "tableName":"functional_parquet.iceberg_partitioned",
+                "tableCreateTime":1687531274
+            }
+        },
+        {
+            "id":2,
+            "vertexType":"COLUMN",
+            "vertexId":"name",
+            "metadata":{
+                "tableType":"kudu",
+                "tableName":"functional_kudu.testtbl",
+                "tableCreateTime":1687531236
+            }
+        },
+        {
+            "id":3,
+            "vertexType":"COLUMN",
+            "vertexId":"functional_parquet.iceberg_partitioned.user",
+            "metadata":{
+                "tableType":"iceberg",
+                "tableName":"functional_parquet.iceberg_partitioned",
+                "tableCreateTime":1687531274
+            }
+        },
+        {
+            "id":4,
+            "vertexType":"COLUMN",
+            "vertexId":"zip",
+            "metadata":{
+                "tableType":"kudu",
+                "tableName":"functional_kudu.testtbl",
+                "tableCreateTime":1687531236
+            }
+        }
+    ]
+}
+====
diff --git a/testdata/workloads/functional-query/queries/QueryTest/lineage.test b/testdata/workloads/functional-query/queries/QueryTest/lineage.test
index fe9fa7fcf..ba808dd9a 100644
--- a/testdata/workloads/functional-query/queries/QueryTest/lineage.test
+++ b/testdata/workloads/functional-query/queries/QueryTest/lineage.test
@@ -17,16 +17,19 @@ create table lineage_test_db.alltypessmall like functional.alltypessmall
 ---- QUERY
 create table lineage_test_db.alltypesinsert like functional.alltypesinsert
 ====
+---- QUERY
+create table lineage_test_db.iceberg_partitioned like functional_parquet.iceberg_partitioned
+====
 ---- LINEAGE
 {
   "hash": "d4c603c171ccad77991279cc4d643625",
-  "timestamp": 1571508467,
+  "timestamp": 1687533491,
   "vertices": [],
   "edges": [],
-  "queryId": "3c45b7f59b52b79b:1b4c7fe800000000",
+  "queryId": "7547f4882e03cdde:941c4bad00000000",
   "user": "anurag",
   "queryText": "create table lineage_test_db.foo (id int)",
-  "endTime": 1571508467
+  "endTime": 1687533491
 }
 ---- QUERY
 # Test lineage is created for DDLs.
@@ -35,13 +38,13 @@ create table lineage_test_db.foo (id int)
 ---- LINEAGE
 {
   "hash": "ce2d65d4f720533b497fad12de070058",
-  "timestamp": 1571508472,
+  "timestamp": 1687533496,
   "vertices": [],
   "edges": [],
-  "queryId": "f64ecc4d6bfedbd6:a347442700000000",
+  "queryId": "554879b21cb9ae72:5e564c9200000000",
   "user": "anurag",
   "queryText": "create external table lineage_test_db.ext_tbl_loc (id int) location '/test-warehouse/lineage_test_db.db/'",
-  "endTime": 1571508473,
+  "endTime": 1687533496,
   "tableLocation": "hdfs://localhost:20500/test-warehouse/lineage_test_db.db"
 }
 ---- QUERY
@@ -52,13 +55,13 @@ create external table lineage_test_db.ext_tbl_loc (id int) location
 ---- LINEAGE
 {
   "hash": "8a07e4a2c8adb0ec4b11276bc0914848",
-  "timestamp": 1571508478,
+  "timestamp": 1687533501,
   "vertices": [],
   "edges": [],
-  "queryId": "8a4711d053812adc:42e4563800000000",
+  "queryId": "1948dbf64fdfe0c2:2cbbe10700000000",
   "user": "anurag",
   "queryText": "create external table lineage_test_db.ext_tbl (id int)",
-  "endTime": 1571508478,
+  "endTime": 1687533501,
   "tableLocation": "hdfs://localhost:20500/test-warehouse/lineage_test_db.db/ext_tbl"
 }
 ---- QUERY
@@ -68,15 +71,16 @@ create external table lineage_test_db.ext_tbl (id int)
 ---- LINEAGE
 {
   "hash": "43a8b8b9355ae5b918c880af6f94bb3e",
-  "timestamp": 1571508483,
+  "timestamp": 1687533506,
   "vertices": [
     {
       "vertexType": "COLUMN",
       "vertexId": "id",
       "id": 0,
       "metadata": {
-        "tableCreateTime": 1571508484,
-        "tableName": "lineage_test_db.ext_ctas"
+        "tableCreateTime": 1687533507,
+        "tableName": "lineage_test_db.ext_ctas",
+        "tableType": "hive"
       }
     },
     {
@@ -84,8 +88,9 @@ create external table lineage_test_db.ext_tbl (id int)
       "vertexId": "lineage_test_db.alltypes.id",
       "id": 1,
       "metadata": {
-        "tableCreateTime": 1571508463,
-        "tableName": "lineage_test_db.alltypes"
+        "tableCreateTime": 1687533490,
+        "tableName": "lineage_test_db.alltypes",
+        "tableType": "hbase"
       }
     },
     {
@@ -93,8 +98,9 @@ create external table lineage_test_db.ext_tbl (id int)
       "vertexId": "bigint_col",
       "id": 2,
       "metadata": {
-        "tableCreateTime": 1571508484,
-        "tableName": "lineage_test_db.ext_ctas"
+        "tableCreateTime": 1687533507,
+        "tableName": "lineage_test_db.ext_ctas",
+        "tableType": "hive"
       }
     },
     {
@@ -102,8 +108,9 @@ create external table lineage_test_db.ext_tbl (id int)
       "vertexId": "lineage_test_db.alltypes.bigint_col",
       "id": 3,
       "metadata": {
-        "tableCreateTime": 1571508463,
-        "tableName": "lineage_test_db.alltypes"
+        "tableCreateTime": 1687533490,
+        "tableName": "lineage_test_db.alltypes",
+        "tableType": "hbase"
       }
     },
     {
@@ -111,8 +118,9 @@ create external table lineage_test_db.ext_tbl (id int)
       "vertexId": "bool_col",
       "id": 4,
       "metadata": {
-        "tableCreateTime": 1571508484,
-        "tableName": "lineage_test_db.ext_ctas"
+        "tableCreateTime": 1687533507,
+        "tableName": "lineage_test_db.ext_ctas",
+        "tableType": "hive"
       }
     },
     {
@@ -120,8 +128,9 @@ create external table lineage_test_db.ext_tbl (id int)
       "vertexId": "lineage_test_db.alltypes.bool_col",
       "id": 5,
       "metadata": {
-        "tableCreateTime": 1571508463,
-        "tableName": "lineage_test_db.alltypes"
+        "tableCreateTime": 1687533490,
+        "tableName": "lineage_test_db.alltypes",
+        "tableType": "hbase"
       }
     },
     {
@@ -129,8 +138,9 @@ create external table lineage_test_db.ext_tbl (id int)
       "vertexId": "date_string_col",
       "id": 6,
       "metadata": {
-        "tableCreateTime": 1571508484,
-        "tableName": "lineage_test_db.ext_ctas"
+        "tableCreateTime": 1687533507,
+        "tableName": "lineage_test_db.ext_ctas",
+        "tableType": "hive"
       }
     },
     {
@@ -138,8 +148,9 @@ create external table lineage_test_db.ext_tbl (id int)
       "vertexId": "lineage_test_db.alltypes.date_string_col",
       "id": 7,
       "metadata": {
-        "tableCreateTime": 1571508463,
-        "tableName": "lineage_test_db.alltypes"
+        "tableCreateTime": 1687533490,
+        "tableName": "lineage_test_db.alltypes",
+        "tableType": "hbase"
       }
     },
     {
@@ -147,8 +158,9 @@ create external table lineage_test_db.ext_tbl (id int)
       "vertexId": "double_col",
       "id": 8,
       "metadata": {
-        "tableCreateTime": 1571508484,
-        "tableName": "lineage_test_db.ext_ctas"
+        "tableCreateTime": 1687533507,
+        "tableName": "lineage_test_db.ext_ctas",
+        "tableType": "hive"
       }
     },
     {
@@ -156,8 +168,9 @@ create external table lineage_test_db.ext_tbl (id int)
       "vertexId": "lineage_test_db.alltypes.double_col",
       "id": 9,
       "metadata": {
-        "tableCreateTime": 1571508463,
-        "tableName": "lineage_test_db.alltypes"
+        "tableCreateTime": 1687533490,
+        "tableName": "lineage_test_db.alltypes",
+        "tableType": "hbase"
       }
     },
     {
@@ -165,8 +178,9 @@ create external table lineage_test_db.ext_tbl (id int)
       "vertexId": "float_col",
       "id": 10,
       "metadata": {
-        "tableCreateTime": 1571508484,
-        "tableName": "lineage_test_db.ext_ctas"
+        "tableCreateTime": 1687533507,
+        "tableName": "lineage_test_db.ext_ctas",
+        "tableType": "hive"
       }
     },
     {
@@ -174,8 +188,9 @@ create external table lineage_test_db.ext_tbl (id int)
       "vertexId": "lineage_test_db.alltypes.float_col",
       "id": 11,
       "metadata": {
-        "tableCreateTime": 1571508463,
-        "tableName": "lineage_test_db.alltypes"
+        "tableCreateTime": 1687533490,
+        "tableName": "lineage_test_db.alltypes",
+        "tableType": "hbase"
       }
     },
     {
@@ -183,8 +198,9 @@ create external table lineage_test_db.ext_tbl (id int)
       "vertexId": "int_col",
       "id": 12,
       "metadata": {
-        "tableCreateTime": 1571508484,
-        "tableName": "lineage_test_db.ext_ctas"
+        "tableCreateTime": 1687533507,
+        "tableName": "lineage_test_db.ext_ctas",
+        "tableType": "hive"
       }
     },
     {
@@ -192,8 +208,9 @@ create external table lineage_test_db.ext_tbl (id int)
       "vertexId": "lineage_test_db.alltypes.int_col",
       "id": 13,
       "metadata": {
-        "tableCreateTime": 1571508463,
-        "tableName": "lineage_test_db.alltypes"
+        "tableCreateTime": 1687533490,
+        "tableName": "lineage_test_db.alltypes",
+        "tableType": "hbase"
       }
     },
     {
@@ -201,8 +218,9 @@ create external table lineage_test_db.ext_tbl (id int)
       "vertexId": "month",
       "id": 14,
       "metadata": {
-        "tableCreateTime": 1571508484,
-        "tableName": "lineage_test_db.ext_ctas"
+        "tableCreateTime": 1687533507,
+        "tableName": "lineage_test_db.ext_ctas",
+        "tableType": "hive"
       }
     },
     {
@@ -210,8 +228,9 @@ create external table lineage_test_db.ext_tbl (id int)
       "vertexId": "lineage_test_db.alltypes.month",
       "id": 15,
       "metadata": {
-        "tableCreateTime": 1571508463,
-        "tableName": "lineage_test_db.alltypes"
+        "tableCreateTime": 1687533490,
+        "tableName": "lineage_test_db.alltypes",
+        "tableType": "hbase"
       }
     },
     {
@@ -219,8 +238,9 @@ create external table lineage_test_db.ext_tbl (id int)
       "vertexId": "smallint_col",
       "id": 16,
       "metadata": {
-        "tableCreateTime": 1571508484,
-        "tableName": "lineage_test_db.ext_ctas"
+        "tableCreateTime": 1687533507,
+        "tableName": "lineage_test_db.ext_ctas",
+        "tableType": "hive"
       }
     },
     {
@@ -228,8 +248,9 @@ create external table lineage_test_db.ext_tbl (id int)
       "vertexId": "lineage_test_db.alltypes.smallint_col",
       "id": 17,
       "metadata": {
-        "tableCreateTime": 1571508463,
-        "tableName": "lineage_test_db.alltypes"
+        "tableCreateTime": 1687533490,
+        "tableName": "lineage_test_db.alltypes",
+        "tableType": "hbase"
       }
     },
     {
@@ -237,8 +258,9 @@ create external table lineage_test_db.ext_tbl (id int)
       "vertexId": "string_col",
       "id": 18,
       "metadata": {
-        "tableCreateTime": 1571508484,
-        "tableName": "lineage_test_db.ext_ctas"
+        "tableCreateTime": 1687533507,
+        "tableName": "lineage_test_db.ext_ctas",
+        "tableType": "hive"
       }
     },
     {
@@ -246,8 +268,9 @@ create external table lineage_test_db.ext_tbl (id int)
       "vertexId": "lineage_test_db.alltypes.string_col",
       "id": 19,
       "metadata": {
-        "tableCreateTime": 1571508463,
-        "tableName": "lineage_test_db.alltypes"
+        "tableCreateTime": 1687533490,
+        "tableName": "lineage_test_db.alltypes",
+        "tableType": "hbase"
       }
     },
     {
@@ -255,8 +278,9 @@ create external table lineage_test_db.ext_tbl (id int)
       "vertexId": "timestamp_col",
       "id": 20,
       "metadata": {
-        "tableCreateTime": 1571508484,
-        "tableName": "lineage_test_db.ext_ctas"
+        "tableCreateTime": 1687533507,
+        "tableName": "lineage_test_db.ext_ctas",
+        "tableType": "hive"
       }
     },
     {
@@ -264,8 +288,9 @@ create external table lineage_test_db.ext_tbl (id int)
       "vertexId": "lineage_test_db.alltypes.timestamp_col",
       "id": 21,
       "metadata": {
-        "tableCreateTime": 1571508463,
-        "tableName": "lineage_test_db.alltypes"
+        "tableCreateTime": 1687533490,
+        "tableName": "lineage_test_db.alltypes",
+        "tableType": "hbase"
       }
     },
     {
@@ -273,8 +298,9 @@ create external table lineage_test_db.ext_tbl (id int)
       "vertexId": "tinyint_col",
       "id": 22,
       "metadata": {
-        "tableCreateTime": 1571508484,
-        "tableName": "lineage_test_db.ext_ctas"
+        "tableCreateTime": 1687533507,
+        "tableName": "lineage_test_db.ext_ctas",
+        "tableType": "hive"
       }
     },
     {
@@ -282,8 +308,9 @@ create external table lineage_test_db.ext_tbl (id int)
       "vertexId": "lineage_test_db.alltypes.tinyint_col",
       "id": 23,
       "metadata": {
-        "tableCreateTime": 1571508463,
-        "tableName": "lineage_test_db.alltypes"
+        "tableCreateTime": 1687533490,
+        "tableName": "lineage_test_db.alltypes",
+        "tableType": "hbase"
       }
     },
     {
@@ -291,8 +318,9 @@ create external table lineage_test_db.ext_tbl (id int)
       "vertexId": "year",
       "id": 24,
       "metadata": {
-        "tableCreateTime": 1571508484,
-        "tableName": "lineage_test_db.ext_ctas"
+        "tableCreateTime": 1687533507,
+        "tableName": "lineage_test_db.ext_ctas",
+        "tableType": "hive"
       }
     },
     {
@@ -300,8 +328,9 @@ create external table lineage_test_db.ext_tbl (id int)
       "vertexId": "lineage_test_db.alltypes.year",
       "id": 25,
       "metadata": {
-        "tableCreateTime": 1571508463,
-        "tableName": "lineage_test_db.alltypes"
+        "tableCreateTime": 1687533490,
+        "tableName": "lineage_test_db.alltypes",
+        "tableType": "hbase"
       }
     }
   ],
@@ -424,10 +453,10 @@ create external table lineage_test_db.ext_tbl (id int)
       "edgeType": "PROJECTION"
     }
   ],
-  "queryId": "8d41cd60bf8542c1:7dd8442f00000000",
+  "queryId": "c0450321c0d12cbe:30419c8200000000",
   "user": "anurag",
   "queryText": "create external table lineage_test_db.ext_ctas as select * from lineage_test_db.alltypes",
-  "endTime": 1571508486,
+  "endTime": 1687533508,
   "tableLocation": "hdfs://localhost:20500/test-warehouse/lineage_test_db.db/ext_ctas"
 }
 ---- QUERY
@@ -440,7 +469,7 @@ create view lineage_test_db.alltypes_view as select * from lineage_test_db.allty
 ---- LINEAGE
 {
   "hash": "3968bd65781e9e856eaca799f4501513",
-  "timestamp": 1571508491,
+  "timestamp": 1687533513,
   "vertices": [
     {
       "vertexType": "COLUMN",
@@ -452,8 +481,9 @@ create view lineage_test_db.alltypes_view as select * from lineage_test_db.allty
       "vertexId": "functional.alltypes.bigint_col",
       "id": 1,
       "metadata": {
-        "tableCreateTime": 1571175281,
-        "tableName": "functional.alltypes"
+        "tableCreateTime": 1687531267,
+        "tableName": "functional.alltypes",
+        "tableType": "hive"
       }
     },
     {
@@ -461,8 +491,9 @@ create view lineage_test_db.alltypes_view as select * from lineage_test_db.allty
       "vertexId": "functional.alltypes.int_col",
       "id": 2,
       "metadata": {
-        "tableCreateTime": 1571175281,
-        "tableName": "functional.alltypes"
+        "tableCreateTime": 1687531267,
+        "tableName": "functional.alltypes",
+        "tableType": "hive"
       }
     },
     {
@@ -470,8 +501,9 @@ create view lineage_test_db.alltypes_view as select * from lineage_test_db.allty
       "vertexId": "functional.alltypes.tinyint_col",
       "id": 3,
       "metadata": {
-        "tableCreateTime": 1571175281,
-        "tableName": "functional.alltypes"
+        "tableCreateTime": 1687531267,
+        "tableName": "functional.alltypes",
+        "tableType": "hive"
       }
     }
   ],
@@ -488,10 +520,10 @@ create view lineage_test_db.alltypes_view as select * from lineage_test_db.allty
       "edgeType": "PROJECTION"
     }
   ],
-  "queryId": "c04b5eeb5062b043:03d579a100000000",
+  "queryId": "8e4d008c58bff1cc:1eb556a200000000",
   "user": "anurag",
   "queryText": "select * from (   select tinyint_col + int_col x from functional.alltypes   union all   select sum(bigint_col) y from (select bigint_col from functional.alltypes) v1) v2",
-  "endTime": 1571508492
+  "endTime": 1687533513
 }
 ---- QUERY
 # Simple query to introduce projection dependencies. Shows resolution
@@ -504,7 +536,7 @@ select * from (
 ---- LINEAGE
 {
   "hash": "0158d41c97236fb9d6b56f5f6fe3d2e6",
-  "timestamp": 1571508497,
+  "timestamp": 1687533518,
   "vertices": [
     {
       "vertexType": "COLUMN",
@@ -516,8 +548,9 @@ select * from (
       "vertexId": "functional.alltypes.tinyint_col",
       "id": 1,
       "metadata": {
-        "tableCreateTime": 1571175281,
-        "tableName": "functional.alltypes"
+        "tableCreateTime": 1687531267,
+        "tableName": "functional.alltypes",
+        "tableType": "hive"
       }
     },
     {
@@ -525,8 +558,9 @@ select * from (
       "vertexId": "functional.alltypes.id",
       "id": 2,
       "metadata": {
-        "tableCreateTime": 1571175281,
-        "tableName": "functional.alltypes"
+        "tableCreateTime": 1687531267,
+        "tableName": "functional.alltypes",
+        "tableType": "hive"
       }
     },
     {
@@ -534,8 +568,9 @@ select * from (
       "vertexId": "functional.alltypes.smallint_col",
       "id": 3,
       "metadata": {
-        "tableCreateTime": 1571175281,
-        "tableName": "functional.alltypes"
+        "tableCreateTime": 1687531267,
+        "tableName": "functional.alltypes",
+        "tableType": "hive"
       }
     },
     {
@@ -548,8 +583,9 @@ select * from (
       "vertexId": "functional.alltypessmall.string_col",
       "id": 5,
       "metadata": {
-        "tableCreateTime": 1571172085,
-        "tableName": "functional.alltypessmall"
+        "tableCreateTime": 1687531269,
+        "tableName": "functional.alltypessmall",
+        "tableType": "hive"
       }
     },
     {
@@ -562,8 +598,9 @@ select * from (
       "vertexId": "functional.alltypessmall.timestamp_col",
       "id": 7,
       "metadata": {
-        "tableCreateTime": 1571172085,
-        "tableName": "functional.alltypessmall"
+        "tableCreateTime": 1687531269,
+        "tableName": "functional.alltypessmall",
+        "tableType": "hive"
       }
     },
     {
@@ -571,8 +608,9 @@ select * from (
       "vertexId": "functional.alltypes.int_col",
       "id": 8,
       "metadata": {
-        "tableCreateTime": 1571175281,
-        "tableName": "functional.alltypes"
+        "tableCreateTime": 1687531267,
+        "tableName": "functional.alltypes",
+        "tableType": "hive"
       }
     },
     {
@@ -580,8 +618,9 @@ select * from (
       "vertexId": "functional.alltypes.year",
       "id": 9,
       "metadata": {
-        "tableCreateTime": 1571175281,
-        "tableName": "functional.alltypes"
+        "tableCreateTime": 1687531267,
+        "tableName": "functional.alltypes",
+        "tableType": "hive"
       }
     },
     {
@@ -589,8 +628,9 @@ select * from (
       "vertexId": "functional.alltypessmall.bigint_col",
       "id": 10,
       "metadata": {
-        "tableCreateTime": 1571172085,
-        "tableName": "functional.alltypessmall"
+        "tableCreateTime": 1687531269,
+        "tableName": "functional.alltypessmall",
+        "tableType": "hive"
       }
     },
     {
@@ -598,8 +638,9 @@ select * from (
       "vertexId": "functional.alltypessmall.float_col",
       "id": 11,
       "metadata": {
-        "tableCreateTime": 1571172085,
-        "tableName": "functional.alltypessmall"
+        "tableCreateTime": 1687531269,
+        "tableName": "functional.alltypessmall",
+        "tableType": "hive"
       }
     },
     {
@@ -607,8 +648,9 @@ select * from (
       "vertexId": "functional.alltypessmall.id",
       "id": 12,
       "metadata": {
-        "tableCreateTime": 1571172085,
-        "tableName": "functional.alltypessmall"
+        "tableCreateTime": 1687531269,
+        "tableName": "functional.alltypessmall",
+        "tableType": "hive"
       }
     }
   ],
@@ -671,10 +713,10 @@ select * from (
       "edgeType": "PREDICATE"
     }
   ],
-  "queryId": "cd4c260544d26311:1955bedb00000000",
+  "queryId": "374d7d4cfcda6f00:11963b1000000000",
   "user": "anurag",
   "queryText": "select sum(a.tinyint_col) over (partition by a.smallint_col order by a.id),   count(b.string_col), b.timestamp_col from functional.alltypes a join functional.alltypessmall b on (a.id = b.id) where a.year = 2010 and b.float_col > 0 group by a.tinyint_col, a.smallint_col, a.id, b.string_col, b.timestamp_col, b.bigint_col having count(a.int_col) > 10 order by b.bigint_col limit 10",
-  "endTime": 1571508498
+  "endTime": 1687533519
 }
 ---- QUERY
 # Simple query to introduce predicate dependencies. Shows conjuncts in WHERE, ON, and
@@ -691,15 +733,16 @@ order by b.bigint_col limit 10
 ---- LINEAGE
 {
   "hash": "ad70ea47a7772f9d59c60ebd4e9c1ac8",
-  "timestamp": 1571508503,
+  "timestamp": 1687533524,
   "vertices": [
     {
       "vertexType": "COLUMN",
       "vertexId": "int_col",
       "id": 0,
       "metadata": {
-        "tableCreateTime": 1571508503,
-        "tableName": "lineage_test_db.lineage_test_tbl1"
+        "tableCreateTime": 1687533524,
+        "tableName": "lineage_test_db.lineage_test_tbl1",
+        "tableType": "hive"
       }
     },
     {
@@ -707,8 +750,9 @@ order by b.bigint_col limit 10
       "vertexId": "functional.alltypes.int_col",
       "id": 1,
       "metadata": {
-        "tableCreateTime": 1571175281,
-        "tableName": "functional.alltypes"
+        "tableCreateTime": 1687531267,
+        "tableName": "functional.alltypes",
+        "tableType": "hive"
       }
     },
     {
@@ -716,8 +760,9 @@ order by b.bigint_col limit 10
       "vertexId": "tinyint_col",
       "id": 2,
       "metadata": {
-        "tableCreateTime": 1571508503,
-        "tableName": "lineage_test_db.lineage_test_tbl1"
+        "tableCreateTime": 1687533524,
+        "tableName": "lineage_test_db.lineage_test_tbl1",
+        "tableType": "hive"
       }
     },
     {
@@ -725,8 +770,9 @@ order by b.bigint_col limit 10
       "vertexId": "functional.alltypes.tinyint_col",
       "id": 3,
       "metadata": {
-        "tableCreateTime": 1571175281,
-        "tableName": "functional.alltypes"
+        "tableCreateTime": 1687531267,
+        "tableName": "functional.alltypes",
+        "tableType": "hive"
       }
     }
   ],
@@ -750,10 +796,10 @@ order by b.bigint_col limit 10
       "edgeType": "PROJECTION"
     }
   ],
-  "queryId": "9c459e0c9d036062:da24885800000000",
+  "queryId": "5341037bc766b0c5:5b9b5c6a00000000",
   "user": "anurag",
   "queryText": "create table lineage_test_db.lineage_test_tbl1 as select int_col, tinyint_col from functional.alltypes",
-  "endTime": 1571508504
+  "endTime": 1687533524
 }
 ---- QUERY
 # CTAS queries
@@ -762,15 +808,16 @@ create table lineage_test_db.lineage_test_tbl1 as select int_col, tinyint_col fr
 ---- LINEAGE
 {
   "hash": "3d7db666c62b0c19ad8e0dd87fa628b0",
-  "timestamp": 1571508509,
+  "timestamp": 1687533529,
   "vertices": [
     {
       "vertexType": "COLUMN",
       "vertexId": "int_col",
       "id": 0,
       "metadata": {
-        "tableCreateTime": 1571508509,
-        "tableName": "lineage_test_db.lineage_test_tbl2"
+        "tableCreateTime": 1687533529,
+        "tableName": "lineage_test_db.lineage_test_tbl2",
+        "tableType": "hive"
       }
     },
     {
@@ -778,8 +825,9 @@ create table lineage_test_db.lineage_test_tbl1 as select int_col, tinyint_col fr
       "vertexId": "functional.alltypes.int_col",
       "id": 1,
       "metadata": {
-        "tableCreateTime": 1571175281,
-        "tableName": "functional.alltypes"
+        "tableCreateTime": 1687531267,
+        "tableName": "functional.alltypes",
+        "tableType": "hive"
       }
     },
     {
@@ -787,8 +835,9 @@ create table lineage_test_db.lineage_test_tbl1 as select int_col, tinyint_col fr
       "vertexId": "string_col",
       "id": 2,
       "metadata": {
-        "tableCreateTime": 1571508509,
-        "tableName": "lineage_test_db.lineage_test_tbl2"
+        "tableCreateTime": 1687533529,
+        "tableName": "lineage_test_db.lineage_test_tbl2",
+        "tableType": "hive"
       }
     },
     {
@@ -796,8 +845,9 @@ create table lineage_test_db.lineage_test_tbl1 as select int_col, tinyint_col fr
       "vertexId": "functional.alltypes.string_col",
       "id": 3,
       "metadata": {
-        "tableCreateTime": 1571175281,
-        "tableName": "functional.alltypes"
+        "tableCreateTime": 1687531267,
+        "tableName": "functional.alltypes",
+        "tableType": "hive"
       }
     },
     {
@@ -805,8 +855,9 @@ create table lineage_test_db.lineage_test_tbl1 as select int_col, tinyint_col fr
       "vertexId": "functional.alltypes.id",
       "id": 4,
       "metadata": {
-        "tableCreateTime": 1571175281,
-        "tableName": "functional.alltypes"
+        "tableCreateTime": 1687531267,
+        "tableName": "functional.alltypes",
+        "tableType": "hive"
       }
     },
     {
@@ -814,8 +865,9 @@ create table lineage_test_db.lineage_test_tbl1 as select int_col, tinyint_col fr
       "vertexId": "functional.alltypes.year",
       "id": 5,
       "metadata": {
-        "tableCreateTime": 1571175281,
-        "tableName": "functional.alltypes"
+        "tableCreateTime": 1687531267,
+        "tableName": "functional.alltypes",
+        "tableType": "hive"
       }
     },
     {
@@ -823,8 +875,9 @@ create table lineage_test_db.lineage_test_tbl1 as select int_col, tinyint_col fr
       "vertexId": "functional.alltypessmall.id",
       "id": 6,
       "metadata": {
-        "tableCreateTime": 1571172085,
-        "tableName": "functional.alltypessmall"
+        "tableCreateTime": 1687531269,
+        "tableName": "functional.alltypessmall",
+        "tableType": "hive"
       }
     },
     {
@@ -832,8 +885,9 @@ create table lineage_test_db.lineage_test_tbl1 as select int_col, tinyint_col fr
       "vertexId": "functional.alltypessmall.month",
       "id": 7,
       "metadata": {
-        "tableCreateTime": 1571172085,
-        "tableName": "functional.alltypessmall"
+        "tableCreateTime": 1687531269,
+        "tableName": "functional.alltypessmall",
+        "tableType": "hive"
       }
     }
   ],
@@ -870,10 +924,10 @@ create table lineage_test_db.lineage_test_tbl1 as select int_col, tinyint_col fr
       "edgeType": "PREDICATE"
     }
   ],
-  "queryId": "504006f6c70b4d6d:e4a30bd900000000",
+  "queryId": "2545984dd298803d:532b0b6100000000",
   "user": "anurag",
   "queryText": "create table lineage_test_db.lineage_test_tbl2 as select distinct a.int_col, a.string_col from functional.alltypes a inner join functional.alltypessmall b on (a.id = b.id) where a.year = 2009 and b.month = 2",
-  "endTime": 1571508510
+  "endTime": 1687533530
 }
 ---- QUERY
 create table lineage_test_db.lineage_test_tbl2 as
@@ -884,15 +938,16 @@ where a.year = 2009 and b.month = 2
 ---- LINEAGE
 {
   "hash": "04f29ab8b0aec034def6173b0c36c588",
-  "timestamp": 1571508515,
+  "timestamp": 1687533535,
   "vertices": [
     {
       "vertexType": "COLUMN",
       "vertexId": "int_col",
       "id": 0,
       "metadata": {
-        "tableCreateTime": 1571508515,
-        "tableName": "lineage_test_db.lineage_test_tbl3"
+        "tableCreateTime": 1687533535,
+        "tableName": "lineage_test_db.lineage_test_tbl3",
+        "tableType": "hive"
       }
     },
     {
@@ -900,8 +955,9 @@ where a.year = 2009 and b.month = 2
       "vertexId": "functional.alltypestiny.int_col",
       "id": 1,
       "metadata": {
-        "tableCreateTime": 1571172091,
-        "tableName": "functional.alltypestiny"
+        "tableCreateTime": 1687531270,
+        "tableName": "functional.alltypestiny",
+        "tableType": "hive"
       }
     }
   ],
@@ -916,10 +972,10 @@ where a.year = 2009 and b.month = 2
       "edgeType": "PROJECTION"
     }
   ],
-  "queryId": "974f555500597d28:867fee2f00000000",
+  "queryId": "e741f71c0e666916:abefa06a00000000",
   "user": "anurag",
   "queryText": "create table lineage_test_db.lineage_test_tbl3 as select * from   (select * from      (select int_col from functional.alltypestiny limit 1) v1 ) v2",
-  "endTime": 1571508516
+  "endTime": 1687533535
 }
 ---- QUERY
 create table lineage_test_db.lineage_test_tbl3 as
@@ -930,15 +986,16 @@ select * from
 ---- LINEAGE
 {
   "hash": "07232504cc67447abf639eed1c6c2411",
-  "timestamp": 1571508521,
+  "timestamp": 1687533540,
   "vertices": [
     {
       "vertexType": "COLUMN",
       "vertexId": "id",
       "id": 0,
       "metadata": {
-        "tableCreateTime": 1571508521,
-        "tableName": "lineage_test_db.lineage_test_tbl4"
+        "tableCreateTime": 1687533540,
+        "tableName": "lineage_test_db.lineage_test_tbl4",
+        "tableType": "hive"
       }
     },
     {
@@ -946,8 +1003,9 @@ select * from
       "vertexId": "functional_hbase.alltypes.id",
       "id": 1,
       "metadata": {
-        "tableCreateTime": 1571175351,
-        "tableName": "functional_hbase.alltypes"
+        "tableCreateTime": 1687531612,
+        "tableName": "functional_hbase.alltypes",
+        "tableType": "hbase"
       }
     },
     {
@@ -955,8 +1013,9 @@ select * from
       "vertexId": "bigint_col",
       "id": 2,
       "metadata": {
-        "tableCreateTime": 1571508521,
-        "tableName": "lineage_test_db.lineage_test_tbl4"
+        "tableCreateTime": 1687533540,
+        "tableName": "lineage_test_db.lineage_test_tbl4",
+        "tableType": "hive"
       }
     },
     {
@@ -964,8 +1023,9 @@ select * from
       "vertexId": "functional_hbase.alltypes.bigint_col",
       "id": 3,
       "metadata": {
-        "tableCreateTime": 1571175351,
-        "tableName": "functional_hbase.alltypes"
+        "tableCreateTime": 1687531612,
+        "tableName": "functional_hbase.alltypes",
+        "tableType": "hbase"
       }
     },
     {
@@ -973,8 +1033,9 @@ select * from
       "vertexId": "bool_col",
       "id": 4,
       "metadata": {
-        "tableCreateTime": 1571508521,
-        "tableName": "lineage_test_db.lineage_test_tbl4"
+        "tableCreateTime": 1687533540,
+        "tableName": "lineage_test_db.lineage_test_tbl4",
+        "tableType": "hive"
       }
     },
     {
@@ -982,8 +1043,9 @@ select * from
       "vertexId": "functional_hbase.alltypes.bool_col",
       "id": 5,
       "metadata": {
-        "tableCreateTime": 1571175351,
-        "tableName": "functional_hbase.alltypes"
+        "tableCreateTime": 1687531612,
+        "tableName": "functional_hbase.alltypes",
+        "tableType": "hbase"
       }
     },
     {
@@ -991,8 +1053,9 @@ select * from
       "vertexId": "date_string_col",
       "id": 6,
       "metadata": {
-        "tableCreateTime": 1571508521,
-        "tableName": "lineage_test_db.lineage_test_tbl4"
+        "tableCreateTime": 1687533540,
+        "tableName": "lineage_test_db.lineage_test_tbl4",
+        "tableType": "hive"
       }
     },
     {
@@ -1000,8 +1063,9 @@ select * from
       "vertexId": "functional_hbase.alltypes.date_string_col",
       "id": 7,
       "metadata": {
-        "tableCreateTime": 1571175351,
-        "tableName": "functional_hbase.alltypes"
+        "tableCreateTime": 1687531612,
+        "tableName": "functional_hbase.alltypes",
+        "tableType": "hbase"
       }
     },
     {
@@ -1009,8 +1073,9 @@ select * from
       "vertexId": "double_col",
       "id": 8,
       "metadata": {
-        "tableCreateTime": 1571508521,
-        "tableName": "lineage_test_db.lineage_test_tbl4"
+        "tableCreateTime": 1687533540,
+        "tableName": "lineage_test_db.lineage_test_tbl4",
+        "tableType": "hive"
       }
     },
     {
@@ -1018,8 +1083,9 @@ select * from
       "vertexId": "functional_hbase.alltypes.double_col",
       "id": 9,
       "metadata": {
-        "tableCreateTime": 1571175351,
-        "tableName": "functional_hbase.alltypes"
+        "tableCreateTime": 1687531612,
+        "tableName": "functional_hbase.alltypes",
+        "tableType": "hbase"
       }
     },
     {
@@ -1027,8 +1093,9 @@ select * from
       "vertexId": "float_col",
       "id": 10,
       "metadata": {
-        "tableCreateTime": 1571508521,
-        "tableName": "lineage_test_db.lineage_test_tbl4"
+        "tableCreateTime": 1687533540,
+        "tableName": "lineage_test_db.lineage_test_tbl4",
+        "tableType": "hive"
       }
     },
     {
@@ -1036,8 +1103,9 @@ select * from
       "vertexId": "functional_hbase.alltypes.float_col",
       "id": 11,
       "metadata": {
-        "tableCreateTime": 1571175351,
-        "tableName": "functional_hbase.alltypes"
+        "tableCreateTime": 1687531612,
+        "tableName": "functional_hbase.alltypes",
+        "tableType": "hbase"
       }
     },
     {
@@ -1045,8 +1113,9 @@ select * from
       "vertexId": "int_col",
       "id": 12,
       "metadata": {
-        "tableCreateTime": 1571508521,
-        "tableName": "lineage_test_db.lineage_test_tbl4"
+        "tableCreateTime": 1687533540,
+        "tableName": "lineage_test_db.lineage_test_tbl4",
+        "tableType": "hive"
       }
     },
     {
@@ -1054,8 +1123,9 @@ select * from
       "vertexId": "functional_hbase.alltypes.int_col",
       "id": 13,
       "metadata": {
-        "tableCreateTime": 1571175351,
-        "tableName": "functional_hbase.alltypes"
+        "tableCreateTime": 1687531612,
+        "tableName": "functional_hbase.alltypes",
+        "tableType": "hbase"
       }
     },
     {
@@ -1063,8 +1133,9 @@ select * from
       "vertexId": "month",
       "id": 14,
       "metadata": {
-        "tableCreateTime": 1571508521,
-        "tableName": "lineage_test_db.lineage_test_tbl4"
+        "tableCreateTime": 1687533540,
+        "tableName": "lineage_test_db.lineage_test_tbl4",
+        "tableType": "hive"
       }
     },
     {
@@ -1072,8 +1143,9 @@ select * from
       "vertexId": "functional_hbase.alltypes.month",
       "id": 15,
       "metadata": {
-        "tableCreateTime": 1571175351,
-        "tableName": "functional_hbase.alltypes"
+        "tableCreateTime": 1687531612,
+        "tableName": "functional_hbase.alltypes",
+        "tableType": "hbase"
       }
     },
     {
@@ -1081,8 +1153,9 @@ select * from
       "vertexId": "smallint_col",
       "id": 16,
       "metadata": {
-        "tableCreateTime": 1571508521,
-        "tableName": "lineage_test_db.lineage_test_tbl4"
+        "tableCreateTime": 1687533540,
+        "tableName": "lineage_test_db.lineage_test_tbl4",
+        "tableType": "hive"
       }
     },
     {
@@ -1090,8 +1163,9 @@ select * from
       "vertexId": "functional_hbase.alltypes.smallint_col",
       "id": 17,
       "metadata": {
-        "tableCreateTime": 1571175351,
-        "tableName": "functional_hbase.alltypes"
+        "tableCreateTime": 1687531612,
+        "tableName": "functional_hbase.alltypes",
+        "tableType": "hbase"
       }
     },
     {
@@ -1099,8 +1173,9 @@ select * from
       "vertexId": "string_col",
       "id": 18,
       "metadata": {
-        "tableCreateTime": 1571508521,
-        "tableName": "lineage_test_db.lineage_test_tbl4"
+        "tableCreateTime": 1687533540,
+        "tableName": "lineage_test_db.lineage_test_tbl4",
+        "tableType": "hive"
       }
     },
     {
@@ -1108,8 +1183,9 @@ select * from
       "vertexId": "functional_hbase.alltypes.string_col",
       "id": 19,
       "metadata": {
-        "tableCreateTime": 1571175351,
-        "tableName": "functional_hbase.alltypes"
+        "tableCreateTime": 1687531612,
+        "tableName": "functional_hbase.alltypes",
+        "tableType": "hbase"
       }
     },
     {
@@ -1117,8 +1193,9 @@ select * from
       "vertexId": "timestamp_col",
       "id": 20,
       "metadata": {
-        "tableCreateTime": 1571508521,
-        "tableName": "lineage_test_db.lineage_test_tbl4"
+        "tableCreateTime": 1687533540,
+        "tableName": "lineage_test_db.lineage_test_tbl4",
+        "tableType": "hive"
       }
     },
     {
@@ -1126,8 +1203,9 @@ select * from
       "vertexId": "functional_hbase.alltypes.timestamp_col",
       "id": 21,
       "metadata": {
-        "tableCreateTime": 1571175351,
-        "tableName": "functional_hbase.alltypes"
+        "tableCreateTime": 1687531612,
+        "tableName": "functional_hbase.alltypes",
+        "tableType": "hbase"
       }
     },
     {
@@ -1135,8 +1213,9 @@ select * from
       "vertexId": "tinyint_col",
       "id": 22,
       "metadata": {
-        "tableCreateTime": 1571508521,
-        "tableName": "lineage_test_db.lineage_test_tbl4"
+        "tableCreateTime": 1687533540,
+        "tableName": "lineage_test_db.lineage_test_tbl4",
+        "tableType": "hive"
       }
     },
     {
@@ -1144,8 +1223,9 @@ select * from
       "vertexId": "functional_hbase.alltypes.tinyint_col",
       "id": 23,
       "metadata": {
-        "tableCreateTime": 1571175351,
-        "tableName": "functional_hbase.alltypes"
+        "tableCreateTime": 1687531612,
+        "tableName": "functional_hbase.alltypes",
+        "tableType": "hbase"
       }
     },
     {
@@ -1153,8 +1233,9 @@ select * from
       "vertexId": "year",
       "id": 24,
       "metadata": {
-        "tableCreateTime": 1571508521,
-        "tableName": "lineage_test_db.lineage_test_tbl4"
+        "tableCreateTime": 1687533540,
+        "tableName": "lineage_test_db.lineage_test_tbl4",
+        "tableType": "hive"
       }
     },
     {
@@ -1162,8 +1243,9 @@ select * from
       "vertexId": "functional_hbase.alltypes.year",
       "id": 25,
       "metadata": {
-        "tableCreateTime": 1571175351,
-        "tableName": "functional_hbase.alltypes"
+        "tableCreateTime": 1687531612,
+        "tableName": "functional_hbase.alltypes",
+        "tableType": "hbase"
       }
     }
   ],
@@ -1286,10 +1368,10 @@ select * from
       "edgeType": "PROJECTION"
     }
   ],
-  "queryId": "d2439eef44931b51:d82a952600000000",
+  "queryId": "a940f90c620a7259:2137273d00000000",
   "user": "anurag",
   "queryText": "create table lineage_test_db.lineage_test_tbl4 as select * from functional_hbase.alltypes limit 5",
-  "endTime": 1571508521
+  "endTime": 1687533540
 }
 ---- QUERY
 # CTAS from HBase table
@@ -1298,15 +1380,16 @@ create table lineage_test_db.lineage_test_tbl4 as select * from functional_hbase
 ---- LINEAGE
 {
   "hash": "861e5f5d91ce0e9e23db6e7f7f451fac",
-  "timestamp": 1571508526,
+  "timestamp": 1687533545,
   "vertices": [
     {
       "vertexType": "COLUMN",
       "vertexId": "id",
       "id": 0,
       "metadata": {
-        "tableCreateTime": 1571508463,
-        "tableName": "lineage_test_db.alltypes"
+        "tableCreateTime": 1687533490,
+        "tableName": "lineage_test_db.alltypes",
+        "tableType": "hbase"
       }
     },
     {
@@ -1314,8 +1397,9 @@ create table lineage_test_db.lineage_test_tbl4 as select * from functional_hbase
       "vertexId": "bigint_col",
       "id": 1,
       "metadata": {
-        "tableCreateTime": 1571508463,
-        "tableName": "lineage_test_db.alltypes"
+        "tableCreateTime": 1687533490,
+        "tableName": "lineage_test_db.alltypes",
+        "tableType": "hbase"
       }
     },
     {
@@ -1323,8 +1407,9 @@ create table lineage_test_db.lineage_test_tbl4 as select * from functional_hbase
       "vertexId": "bool_col",
       "id": 2,
       "metadata": {
-        "tableCreateTime": 1571508463,
-        "tableName": "lineage_test_db.alltypes"
+        "tableCreateTime": 1687533490,
+        "tableName": "lineage_test_db.alltypes",
+        "tableType": "hbase"
       }
     },
     {
@@ -1332,8 +1417,9 @@ create table lineage_test_db.lineage_test_tbl4 as select * from functional_hbase
       "vertexId": "date_string_col",
       "id": 3,
       "metadata": {
-        "tableCreateTime": 1571508463,
-        "tableName": "lineage_test_db.alltypes"
+        "tableCreateTime": 1687533490,
+        "tableName": "lineage_test_db.alltypes",
+        "tableType": "hbase"
       }
     },
     {
@@ -1341,8 +1427,9 @@ create table lineage_test_db.lineage_test_tbl4 as select * from functional_hbase
       "vertexId": "double_col",
       "id": 4,
       "metadata": {
-        "tableCreateTime": 1571508463,
-        "tableName": "lineage_test_db.alltypes"
+        "tableCreateTime": 1687533490,
+        "tableName": "lineage_test_db.alltypes",
+        "tableType": "hbase"
       }
     },
     {
@@ -1350,8 +1437,9 @@ create table lineage_test_db.lineage_test_tbl4 as select * from functional_hbase
       "vertexId": "float_col",
       "id": 5,
       "metadata": {
-        "tableCreateTime": 1571508463,
-        "tableName": "lineage_test_db.alltypes"
+        "tableCreateTime": 1687533490,
+        "tableName": "lineage_test_db.alltypes",
+        "tableType": "hbase"
       }
     },
     {
@@ -1359,8 +1447,9 @@ create table lineage_test_db.lineage_test_tbl4 as select * from functional_hbase
       "vertexId": "int_col",
       "id": 6,
       "metadata": {
-        "tableCreateTime": 1571508463,
-        "tableName": "lineage_test_db.alltypes"
+        "tableCreateTime": 1687533490,
+        "tableName": "lineage_test_db.alltypes",
+        "tableType": "hbase"
       }
     },
     {
@@ -1368,8 +1457,9 @@ create table lineage_test_db.lineage_test_tbl4 as select * from functional_hbase
       "vertexId": "month",
       "id": 7,
       "metadata": {
-        "tableCreateTime": 1571508463,
-        "tableName": "lineage_test_db.alltypes"
+        "tableCreateTime": 1687533490,
+        "tableName": "lineage_test_db.alltypes",
+        "tableType": "hbase"
       }
     },
     {
@@ -1377,8 +1467,9 @@ create table lineage_test_db.lineage_test_tbl4 as select * from functional_hbase
       "vertexId": "smallint_col",
       "id": 8,
       "metadata": {
-        "tableCreateTime": 1571508463,
-        "tableName": "lineage_test_db.alltypes"
+        "tableCreateTime": 1687533490,
+        "tableName": "lineage_test_db.alltypes",
+        "tableType": "hbase"
       }
     },
     {
@@ -1386,8 +1477,9 @@ create table lineage_test_db.lineage_test_tbl4 as select * from functional_hbase
       "vertexId": "string_col",
       "id": 9,
       "metadata": {
-        "tableCreateTime": 1571508463,
-        "tableName": "lineage_test_db.alltypes"
+        "tableCreateTime": 1687533490,
+        "tableName": "lineage_test_db.alltypes",
+        "tableType": "hbase"
       }
     },
     {
@@ -1395,8 +1487,9 @@ create table lineage_test_db.lineage_test_tbl4 as select * from functional_hbase
       "vertexId": "timestamp_col",
       "id": 10,
       "metadata": {
-        "tableCreateTime": 1571508463,
-        "tableName": "lineage_test_db.alltypes"
+        "tableCreateTime": 1687533490,
+        "tableName": "lineage_test_db.alltypes",
+        "tableType": "hbase"
       }
     },
     {
@@ -1404,8 +1497,9 @@ create table lineage_test_db.lineage_test_tbl4 as select * from functional_hbase
       "vertexId": "tinyint_col",
       "id": 11,
       "metadata": {
-        "tableCreateTime": 1571508463,
-        "tableName": "lineage_test_db.alltypes"
+        "tableCreateTime": 1687533490,
+        "tableName": "lineage_test_db.alltypes",
+        "tableType": "hbase"
       }
     },
     {
@@ -1413,8 +1507,9 @@ create table lineage_test_db.lineage_test_tbl4 as select * from functional_hbase
       "vertexId": "year",
       "id": 12,
       "metadata": {
-        "tableCreateTime": 1571508463,
-        "tableName": "lineage_test_db.alltypes"
+        "tableCreateTime": 1687533490,
+        "tableName": "lineage_test_db.alltypes",
+        "tableType": "hbase"
       }
     }
   ],
@@ -1511,10 +1606,10 @@ create table lineage_test_db.lineage_test_tbl4 as select * from functional_hbase
       "edgeType": "PROJECTION"
     }
   ],
-  "queryId": "5640f06b844acdfc:d01daab300000000",
+  "queryId": "664e64cfb1d3fd09:ef8dd84600000000",
   "user": "anurag",
   "queryText": "insert into lineage_test_db.alltypes   values (1, 1, true, \"1999-12-01\", 2.0, 1.0, 1, 12, 2, \"abs\",   cast(now() as timestamp), 1, 1999)",
-  "endTime": 1571508526
+  "endTime": 1687533546
 }
 ---- QUERY
 # Insert into an HBase table
@@ -1526,15 +1621,16 @@ lineage_test_db.alltypes
 ---- LINEAGE
 {
   "hash": "8b1ddbc13665ae532868598c025d1668",
-  "timestamp": 1571508531,
+  "timestamp": 1687533551,
   "vertices": [
     {
       "vertexType": "COLUMN",
       "vertexId": "id",
       "id": 0,
       "metadata": {
-        "tableCreateTime": 1571508464,
-        "tableName": "lineage_test_db.alltypesnopart"
+        "tableCreateTime": 1687533490,
+        "tableName": "lineage_test_db.alltypesnopart",
+        "tableType": "hive"
       }
     },
     {
@@ -1542,8 +1638,9 @@ lineage_test_db.alltypes
       "vertexId": "functional.alltypes.id",
       "id": 1,
       "metadata": {
-        "tableCreateTime": 1571175281,
-        "tableName": "functional.alltypes"
+        "tableCreateTime": 1687531267,
+        "tableName": "functional.alltypes",
+        "tableType": "hive"
       }
     },
     {
@@ -1551,8 +1648,9 @@ lineage_test_db.alltypes
       "vertexId": "bool_col",
       "id": 2,
       "metadata": {
-        "tableCreateTime": 1571508464,
-        "tableName": "lineage_test_db.alltypesnopart"
+        "tableCreateTime": 1687533490,
+        "tableName": "lineage_test_db.alltypesnopart",
+        "tableType": "hive"
       }
     },
     {
@@ -1560,8 +1658,9 @@ lineage_test_db.alltypes
       "vertexId": "functional.alltypes.bool_col",
       "id": 3,
       "metadata": {
-        "tableCreateTime": 1571175281,
-        "tableName": "functional.alltypes"
+        "tableCreateTime": 1687531267,
+        "tableName": "functional.alltypes",
+        "tableType": "hive"
       }
     },
     {
@@ -1569,8 +1668,9 @@ lineage_test_db.alltypes
       "vertexId": "tinyint_col",
       "id": 4,
       "metadata": {
-        "tableCreateTime": 1571508464,
-        "tableName": "lineage_test_db.alltypesnopart"
+        "tableCreateTime": 1687533490,
+        "tableName": "lineage_test_db.alltypesnopart",
+        "tableType": "hive"
       }
     },
     {
@@ -1578,8 +1678,9 @@ lineage_test_db.alltypes
       "vertexId": "smallint_col",
       "id": 5,
       "metadata": {
-        "tableCreateTime": 1571508464,
-        "tableName": "lineage_test_db.alltypesnopart"
+        "tableCreateTime": 1687533490,
+        "tableName": "lineage_test_db.alltypesnopart",
+        "tableType": "hive"
       }
     },
     {
@@ -1587,8 +1688,9 @@ lineage_test_db.alltypes
       "vertexId": "int_col",
       "id": 6,
       "metadata": {
-        "tableCreateTime": 1571508464,
-        "tableName": "lineage_test_db.alltypesnopart"
+        "tableCreateTime": 1687533490,
+        "tableName": "lineage_test_db.alltypesnopart",
+        "tableType": "hive"
       }
     },
     {
@@ -1596,8 +1698,9 @@ lineage_test_db.alltypes
       "vertexId": "bigint_col",
       "id": 7,
       "metadata": {
-        "tableCreateTime": 1571508464,
-        "tableName": "lineage_test_db.alltypesnopart"
+        "tableCreateTime": 1687533490,
+        "tableName": "lineage_test_db.alltypesnopart",
+        "tableType": "hive"
       }
     },
     {
@@ -1605,8 +1708,9 @@ lineage_test_db.alltypes
       "vertexId": "float_col",
       "id": 8,
       "metadata": {
-        "tableCreateTime": 1571508464,
-        "tableName": "lineage_test_db.alltypesnopart"
+        "tableCreateTime": 1687533490,
+        "tableName": "lineage_test_db.alltypesnopart",
+        "tableType": "hive"
       }
     },
     {
@@ -1614,8 +1718,9 @@ lineage_test_db.alltypes
       "vertexId": "double_col",
       "id": 9,
       "metadata": {
-        "tableCreateTime": 1571508464,
-        "tableName": "lineage_test_db.alltypesnopart"
+        "tableCreateTime": 1687533490,
+        "tableName": "lineage_test_db.alltypesnopart",
+        "tableType": "hive"
       }
     },
     {
@@ -1623,8 +1728,9 @@ lineage_test_db.alltypes
       "vertexId": "date_string_col",
       "id": 10,
       "metadata": {
-        "tableCreateTime": 1571508464,
-        "tableName": "lineage_test_db.alltypesnopart"
+        "tableCreateTime": 1687533490,
+        "tableName": "lineage_test_db.alltypesnopart",
+        "tableType": "hive"
       }
     },
     {
@@ -1632,8 +1738,9 @@ lineage_test_db.alltypes
       "vertexId": "string_col",
       "id": 11,
       "metadata": {
-        "tableCreateTime": 1571508464,
-        "tableName": "lineage_test_db.alltypesnopart"
+        "tableCreateTime": 1687533490,
+        "tableName": "lineage_test_db.alltypesnopart",
+        "tableType": "hive"
       }
     },
     {
@@ -1641,8 +1748,9 @@ lineage_test_db.alltypes
       "vertexId": "timestamp_col",
       "id": 12,
       "metadata": {
-        "tableCreateTime": 1571508464,
-        "tableName": "lineage_test_db.alltypesnopart"
+        "tableCreateTime": 1687533490,
+        "tableName": "lineage_test_db.alltypesnopart",
+        "tableType": "hive"
       }
     },
     {
@@ -1650,8 +1758,9 @@ lineage_test_db.alltypes
       "vertexId": "functional.alltypes.timestamp_col",
       "id": 13,
       "metadata": {
-        "tableCreateTime": 1571175281,
-        "tableName": "functional.alltypes"
+        "tableCreateTime": 1687531267,
+        "tableName": "functional.alltypes",
+        "tableType": "hive"
       }
     }
   ],
@@ -1740,10 +1849,10 @@ lineage_test_db.alltypes
       "edgeType": "PROJECTION"
     }
   ],
-  "queryId": "604902011a1d8e57:a86fb43e00000000",
+  "queryId": "784e59087868d497:418a666800000000",
   "user": "anurag",
   "queryText": "insert into table lineage_test_db.alltypesnopart (id, bool_col, timestamp_col) select id, bool_col, timestamp_col from functional.alltypes",
-  "endTime": 1571508532
+  "endTime": 1687533551
 }
 ---- QUERY
 insert into table lineage_test_db.alltypesnopart (id, bool_col, timestamp_col)
@@ -1753,15 +1862,16 @@ from functional.alltypes
 ---- LINEAGE
 {
   "hash": "e7c1630d4593c64d0372e32c28484667",
-  "timestamp": 1571508537,
+  "timestamp": 1687533556,
   "vertices": [
     {
       "vertexType": "COLUMN",
       "vertexId": "year",
       "id": 0,
       "metadata": {
-        "tableCreateTime": 1571508465,
-        "tableName": "lineage_test_db.alltypessmall"
+        "tableCreateTime": 1687533490,
+        "tableName": "lineage_test_db.alltypessmall",
+        "tableType": "hive"
       }
     },
     {
@@ -1769,8 +1879,9 @@ from functional.alltypes
       "vertexId": "month",
       "id": 1,
       "metadata": {
-        "tableCreateTime": 1571508465,
-        "tableName": "lineage_test_db.alltypessmall"
+        "tableCreateTime": 1687533490,
+        "tableName": "lineage_test_db.alltypessmall",
+        "tableType": "hive"
       }
     },
     {
@@ -1778,8 +1889,9 @@ from functional.alltypes
       "vertexId": "id",
       "id": 2,
       "metadata": {
-        "tableCreateTime": 1571508465,
-        "tableName": "lineage_test_db.alltypessmall"
+        "tableCreateTime": 1687533490,
+        "tableName": "lineage_test_db.alltypessmall",
+        "tableType": "hive"
       }
     },
     {
@@ -1787,8 +1899,9 @@ from functional.alltypes
       "vertexId": "bool_col",
       "id": 3,
       "metadata": {
-        "tableCreateTime": 1571508465,
-        "tableName": "lineage_test_db.alltypessmall"
+        "tableCreateTime": 1687533490,
+        "tableName": "lineage_test_db.alltypessmall",
+        "tableType": "hive"
       }
     },
     {
@@ -1796,8 +1909,9 @@ from functional.alltypes
       "vertexId": "tinyint_col",
       "id": 4,
       "metadata": {
-        "tableCreateTime": 1571508465,
-        "tableName": "lineage_test_db.alltypessmall"
+        "tableCreateTime": 1687533490,
+        "tableName": "lineage_test_db.alltypessmall",
+        "tableType": "hive"
       }
     },
     {
@@ -1805,8 +1919,9 @@ from functional.alltypes
       "vertexId": "smallint_col",
       "id": 5,
       "metadata": {
-        "tableCreateTime": 1571508465,
-        "tableName": "lineage_test_db.alltypessmall"
+        "tableCreateTime": 1687533490,
+        "tableName": "lineage_test_db.alltypessmall",
+        "tableType": "hive"
       }
     },
     {
@@ -1814,8 +1929,9 @@ from functional.alltypes
       "vertexId": "functional.alltypes.smallint_col",
       "id": 6,
       "metadata": {
-        "tableCreateTime": 1571175281,
-        "tableName": "functional.alltypes"
+        "tableCreateTime": 1687531267,
+        "tableName": "functional.alltypes",
+        "tableType": "hive"
       }
     },
     {
@@ -1823,8 +1939,9 @@ from functional.alltypes
       "vertexId": "int_col",
       "id": 7,
       "metadata": {
-        "tableCreateTime": 1571508465,
-        "tableName": "lineage_test_db.alltypessmall"
+        "tableCreateTime": 1687533490,
+        "tableName": "lineage_test_db.alltypessmall",
+        "tableType": "hive"
       }
     },
     {
@@ -1832,8 +1949,9 @@ from functional.alltypes
       "vertexId": "functional.alltypes.int_col",
       "id": 8,
       "metadata": {
-        "tableCreateTime": 1571175281,
-        "tableName": "functional.alltypes"
+        "tableCreateTime": 1687531267,
+        "tableName": "functional.alltypes",
+        "tableType": "hive"
       }
     },
     {
@@ -1841,8 +1959,9 @@ from functional.alltypes
       "vertexId": "bigint_col",
       "id": 9,
       "metadata": {
-        "tableCreateTime": 1571508465,
-        "tableName": "lineage_test_db.alltypessmall"
+        "tableCreateTime": 1687533490,
+        "tableName": "lineage_test_db.alltypessmall",
+        "tableType": "hive"
       }
     },
     {
@@ -1850,8 +1969,9 @@ from functional.alltypes
       "vertexId": "float_col",
       "id": 10,
       "metadata": {
-        "tableCreateTime": 1571508465,
-        "tableName": "lineage_test_db.alltypessmall"
+        "tableCreateTime": 1687533490,
+        "tableName": "lineage_test_db.alltypessmall",
+        "tableType": "hive"
       }
     },
     {
@@ -1859,8 +1979,9 @@ from functional.alltypes
       "vertexId": "double_col",
       "id": 11,
       "metadata": {
-        "tableCreateTime": 1571508465,
-        "tableName": "lineage_test_db.alltypessmall"
+        "tableCreateTime": 1687533490,
+        "tableName": "lineage_test_db.alltypessmall",
+        "tableType": "hive"
       }
     },
     {
@@ -1868,8 +1989,9 @@ from functional.alltypes
       "vertexId": "date_string_col",
       "id": 12,
       "metadata": {
-        "tableCreateTime": 1571508465,
-        "tableName": "lineage_test_db.alltypessmall"
+        "tableCreateTime": 1687533490,
+        "tableName": "lineage_test_db.alltypessmall",
+        "tableType": "hive"
       }
     },
     {
@@ -1877,8 +1999,9 @@ from functional.alltypes
       "vertexId": "string_col",
       "id": 13,
       "metadata": {
-        "tableCreateTime": 1571508465,
-        "tableName": "lineage_test_db.alltypessmall"
+        "tableCreateTime": 1687533490,
+        "tableName": "lineage_test_db.alltypessmall",
+        "tableType": "hive"
       }
     },
     {
@@ -1886,8 +2009,9 @@ from functional.alltypes
       "vertexId": "timestamp_col",
       "id": 14,
       "metadata": {
-        "tableCreateTime": 1571508465,
-        "tableName": "lineage_test_db.alltypessmall"
+        "tableCreateTime": 1687533490,
+        "tableName": "lineage_test_db.alltypessmall",
+        "tableType": "hive"
       }
     },
     {
@@ -1895,8 +2019,9 @@ from functional.alltypes
       "vertexId": "functional.alltypes.month",
       "id": 15,
       "metadata": {
-        "tableCreateTime": 1571175281,
-        "tableName": "functional.alltypes"
+        "tableCreateTime": 1687531267,
+        "tableName": "functional.alltypes",
+        "tableType": "hive"
       }
     },
     {
@@ -1904,8 +2029,9 @@ from functional.alltypes
       "vertexId": "functional.alltypes.year",
       "id": 16,
       "metadata": {
-        "tableCreateTime": 1571175281,
-        "tableName": "functional.alltypes"
+        "tableCreateTime": 1687531267,
+        "tableName": "functional.alltypes",
+        "tableType": "hive"
       }
     }
   ],
@@ -2028,10 +2154,10 @@ from functional.alltypes
       "edgeType": "PREDICATE"
     }
   ],
-  "queryId": "ab47e55fbc39a82c:e2ddd64500000000",
+  "queryId": "50459cec26bebcb8:6d71e38a00000000",
   "user": "anurag",
   "queryText": "insert into table lineage_test_db.alltypessmall (smallint_col, int_col) partition (year=2009, month=04) select smallint_col, int_col from functional.alltypes where year=2009 and month=05",
-  "endTime": 1571508538
+  "endTime": 1687533556
 }
 ---- QUERY
 insert into table lineage_test_db.alltypessmall (smallint_col, int_col)
@@ -2043,15 +2169,16 @@ where year=2009 and month=05
 ---- LINEAGE
 {
   "hash": "727d89dd58676c0d36995a90e625607e",
-  "timestamp": 1571508543,
+  "timestamp": 1687533561,
   "vertices": [
     {
       "vertexType": "COLUMN",
       "vertexId": "year",
       "id": 0,
       "metadata": {
-        "tableCreateTime": 1571508465,
-        "tableName": "lineage_test_db.alltypessmall"
+        "tableCreateTime": 1687533490,
+        "tableName": "lineage_test_db.alltypessmall",
+        "tableType": "hive"
       }
     },
     {
@@ -2059,8 +2186,9 @@ where year=2009 and month=05
       "vertexId": "functional_seq_snap.alltypes.year",
       "id": 1,
       "metadata": {
-        "tableCreateTime": 1571175280,
-        "tableName": "functional_seq_snap.alltypes"
+        "tableCreateTime": 1687531272,
+        "tableName": "functional_seq_snap.alltypes",
+        "tableType": "hive"
       }
     },
     {
@@ -2068,8 +2196,9 @@ where year=2009 and month=05
       "vertexId": "month",
       "id": 2,
       "metadata": {
-        "tableCreateTime": 1571508465,
-        "tableName": "lineage_test_db.alltypessmall"
+        "tableCreateTime": 1687533490,
+        "tableName": "lineage_test_db.alltypessmall",
+        "tableType": "hive"
       }
     },
     {
@@ -2077,8 +2206,9 @@ where year=2009 and month=05
       "vertexId": "functional_seq_snap.alltypes.month",
       "id": 3,
       "metadata": {
-        "tableCreateTime": 1571175280,
-        "tableName": "functional_seq_snap.alltypes"
+        "tableCreateTime": 1687531272,
+        "tableName": "functional_seq_snap.alltypes",
+        "tableType": "hive"
       }
     },
     {
@@ -2086,8 +2216,9 @@ where year=2009 and month=05
       "vertexId": "id",
       "id": 4,
       "metadata": {
-        "tableCreateTime": 1571508465,
-        "tableName": "lineage_test_db.alltypessmall"
+        "tableCreateTime": 1687533490,
+        "tableName": "lineage_test_db.alltypessmall",
+        "tableType": "hive"
       }
     },
     {
@@ -2095,8 +2226,9 @@ where year=2009 and month=05
       "vertexId": "functional_seq_snap.alltypes.id",
       "id": 5,
       "metadata": {
-        "tableCreateTime": 1571175280,
-        "tableName": "functional_seq_snap.alltypes"
+        "tableCreateTime": 1687531272,
+        "tableName": "functional_seq_snap.alltypes",
+        "tableType": "hive"
       }
     },
     {
@@ -2104,8 +2236,9 @@ where year=2009 and month=05
       "vertexId": "bool_col",
       "id": 6,
       "metadata": {
-        "tableCreateTime": 1571508465,
-        "tableName": "lineage_test_db.alltypessmall"
+        "tableCreateTime": 1687533490,
+        "tableName": "lineage_test_db.alltypessmall",
+        "tableType": "hive"
       }
     },
     {
@@ -2113,8 +2246,9 @@ where year=2009 and month=05
       "vertexId": "tinyint_col",
       "id": 7,
       "metadata": {
-        "tableCreateTime": 1571508465,
-        "tableName": "lineage_test_db.alltypessmall"
+        "tableCreateTime": 1687533490,
+        "tableName": "lineage_test_db.alltypessmall",
+        "tableType": "hive"
       }
     },
     {
@@ -2122,8 +2256,9 @@ where year=2009 and month=05
       "vertexId": "smallint_col",
       "id": 8,
       "metadata": {
-        "tableCreateTime": 1571508465,
-        "tableName": "lineage_test_db.alltypessmall"
+        "tableCreateTime": 1687533490,
+        "tableName": "lineage_test_db.alltypessmall",
+        "tableType": "hive"
       }
     },
     {
@@ -2131,8 +2266,9 @@ where year=2009 and month=05
       "vertexId": "int_col",
       "id": 9,
       "metadata": {
-        "tableCreateTime": 1571508465,
-        "tableName": "lineage_test_db.alltypessmall"
+        "tableCreateTime": 1687533490,
+        "tableName": "lineage_test_db.alltypessmall",
+        "tableType": "hive"
       }
     },
     {
@@ -2140,8 +2276,9 @@ where year=2009 and month=05
       "vertexId": "functional_seq_snap.alltypes.int_col",
       "id": 10,
       "metadata": {
-        "tableCreateTime": 1571175280,
-        "tableName": "functional_seq_snap.alltypes"
+        "tableCreateTime": 1687531272,
+        "tableName": "functional_seq_snap.alltypes",
+        "tableType": "hive"
       }
     },
     {
@@ -2149,8 +2286,9 @@ where year=2009 and month=05
       "vertexId": "bigint_col",
       "id": 11,
       "metadata": {
-        "tableCreateTime": 1571508465,
-        "tableName": "lineage_test_db.alltypessmall"
+        "tableCreateTime": 1687533490,
+        "tableName": "lineage_test_db.alltypessmall",
+        "tableType": "hive"
       }
     },
     {
@@ -2158,8 +2296,9 @@ where year=2009 and month=05
       "vertexId": "float_col",
       "id": 12,
       "metadata": {
-        "tableCreateTime": 1571508465,
-        "tableName": "lineage_test_db.alltypessmall"
+        "tableCreateTime": 1687533490,
+        "tableName": "lineage_test_db.alltypessmall",
+        "tableType": "hive"
       }
     },
     {
@@ -2167,8 +2306,9 @@ where year=2009 and month=05
       "vertexId": "double_col",
       "id": 13,
       "metadata": {
-        "tableCreateTime": 1571508465,
-        "tableName": "lineage_test_db.alltypessmall"
+        "tableCreateTime": 1687533490,
+        "tableName": "lineage_test_db.alltypessmall",
+        "tableType": "hive"
       }
     },
     {
@@ -2176,8 +2316,9 @@ where year=2009 and month=05
       "vertexId": "date_string_col",
       "id": 14,
       "metadata": {
-        "tableCreateTime": 1571508465,
-        "tableName": "lineage_test_db.alltypessmall"
+        "tableCreateTime": 1687533490,
+        "tableName": "lineage_test_db.alltypessmall",
+        "tableType": "hive"
       }
     },
     {
@@ -2185,8 +2326,9 @@ where year=2009 and month=05
       "vertexId": "string_col",
       "id": 15,
       "metadata": {
-        "tableCreateTime": 1571508465,
-        "tableName": "lineage_test_db.alltypessmall"
+        "tableCreateTime": 1687533490,
+        "tableName": "lineage_test_db.alltypessmall",
+        "tableType": "hive"
       }
     },
     {
@@ -2194,8 +2336,9 @@ where year=2009 and month=05
       "vertexId": "functional_seq_snap.alltypes.string_col",
       "id": 16,
       "metadata": {
-        "tableCreateTime": 1571175280,
-        "tableName": "functional_seq_snap.alltypes"
+        "tableCreateTime": 1687531272,
+        "tableName": "functional_seq_snap.alltypes",
+        "tableType": "hive"
       }
     },
     {
@@ -2203,8 +2346,9 @@ where year=2009 and month=05
       "vertexId": "timestamp_col",
       "id": 17,
       "metadata": {
-        "tableCreateTime": 1571508465,
-        "tableName": "lineage_test_db.alltypessmall"
+        "tableCreateTime": 1687533490,
+        "tableName": "lineage_test_db.alltypessmall",
+        "tableType": "hive"
       }
     }
   ],
@@ -2333,10 +2477,10 @@ where year=2009 and month=05
       "edgeType": "PREDICATE"
     }
   ],
-  "queryId": "b944749834207a6e:2af1b52500000000",
+  "queryId": "ca4e2ac78776624d:6e44f11c00000000",
   "user": "anurag",
   "queryText": "insert into table lineage_test_db.alltypessmall (id, string_col, int_col) partition (year, month) select id, string_col, int_col, year, month from functional_seq_snap.alltypes where year=2009 and month>10",
-  "endTime": 1571508543
+  "endTime": 1687533562
 }
 ---- QUERY
 insert into table lineage_test_db.alltypessmall (id, string_col, int_col)
@@ -2348,15 +2492,16 @@ where year=2009 and month>10
 ---- LINEAGE
 {
   "hash": "516fa0d094aca2d64042484a84e19208",
-  "timestamp": 1571508549,
+  "timestamp": 1687533567,
   "vertices": [
     {
       "vertexType": "COLUMN",
       "vertexId": "year",
       "id": 0,
       "metadata": {
-        "tableCreateTime": 1571508465,
-        "tableName": "lineage_test_db.alltypessmall"
+        "tableCreateTime": 1687533490,
+        "tableName": "lineage_test_db.alltypessmall",
+        "tableType": "hive"
       }
     },
     {
@@ -2364,8 +2509,9 @@ where year=2009 and month>10
       "vertexId": "month",
       "id": 1,
       "metadata": {
-        "tableCreateTime": 1571508465,
-        "tableName": "lineage_test_db.alltypessmall"
+        "tableCreateTime": 1687533490,
+        "tableName": "lineage_test_db.alltypessmall",
+        "tableType": "hive"
       }
     },
     {
@@ -2373,8 +2519,9 @@ where year=2009 and month>10
       "vertexId": "functional.alltypes.month",
       "id": 2,
       "metadata": {
-        "tableCreateTime": 1571175281,
-        "tableName": "functional.alltypes"
+        "tableCreateTime": 1687531267,
+        "tableName": "functional.alltypes",
+        "tableType": "hive"
       }
     },
     {
@@ -2382,8 +2529,9 @@ where year=2009 and month>10
       "vertexId": "id",
       "id": 3,
       "metadata": {
-        "tableCreateTime": 1571508465,
-        "tableName": "lineage_test_db.alltypessmall"
+        "tableCreateTime": 1687533490,
+        "tableName": "lineage_test_db.alltypessmall",
+        "tableType": "hive"
       }
     },
     {
@@ -2391,8 +2539,9 @@ where year=2009 and month>10
       "vertexId": "functional.alltypes.id",
       "id": 4,
       "metadata": {
-        "tableCreateTime": 1571175281,
-        "tableName": "functional.alltypes"
+        "tableCreateTime": 1687531267,
+        "tableName": "functional.alltypes",
+        "tableType": "hive"
       }
     },
     {
@@ -2400,8 +2549,9 @@ where year=2009 and month>10
       "vertexId": "bool_col",
       "id": 5,
       "metadata": {
-        "tableCreateTime": 1571508465,
-        "tableName": "lineage_test_db.alltypessmall"
+        "tableCreateTime": 1687533490,
+        "tableName": "lineage_test_db.alltypessmall",
+        "tableType": "hive"
       }
     },
     {
@@ -2409,8 +2559,9 @@ where year=2009 and month>10
       "vertexId": "functional.alltypes.bool_col",
       "id": 6,
       "metadata": {
-        "tableCreateTime": 1571175281,
-        "tableName": "functional.alltypes"
+        "tableCreateTime": 1687531267,
+        "tableName": "functional.alltypes",
+        "tableType": "hive"
       }
     },
     {
@@ -2418,8 +2569,9 @@ where year=2009 and month>10
       "vertexId": "tinyint_col",
       "id": 7,
       "metadata": {
-        "tableCreateTime": 1571508465,
-        "tableName": "lineage_test_db.alltypessmall"
+        "tableCreateTime": 1687533490,
+        "tableName": "lineage_test_db.alltypessmall",
+        "tableType": "hive"
       }
     },
     {
@@ -2427,8 +2579,9 @@ where year=2009 and month>10
       "vertexId": "functional.alltypes.tinyint_col",
       "id": 8,
       "metadata": {
-        "tableCreateTime": 1571175281,
-        "tableName": "functional.alltypes"
+        "tableCreateTime": 1687531267,
+        "tableName": "functional.alltypes",
+        "tableType": "hive"
       }
     },
     {
@@ -2436,8 +2589,9 @@ where year=2009 and month>10
       "vertexId": "smallint_col",
       "id": 9,
       "metadata": {
-        "tableCreateTime": 1571508465,
-        "tableName": "lineage_test_db.alltypessmall"
+        "tableCreateTime": 1687533490,
+        "tableName": "lineage_test_db.alltypessmall",
+        "tableType": "hive"
       }
     },
     {
@@ -2445,8 +2599,9 @@ where year=2009 and month>10
       "vertexId": "functional.alltypes.smallint_col",
       "id": 10,
       "metadata": {
-        "tableCreateTime": 1571175281,
-        "tableName": "functional.alltypes"
+        "tableCreateTime": 1687531267,
+        "tableName": "functional.alltypes",
+        "tableType": "hive"
       }
     },
     {
@@ -2454,8 +2609,9 @@ where year=2009 and month>10
       "vertexId": "int_col",
       "id": 11,
       "metadata": {
-        "tableCreateTime": 1571508465,
-        "tableName": "lineage_test_db.alltypessmall"
+        "tableCreateTime": 1687533490,
+        "tableName": "lineage_test_db.alltypessmall",
+        "tableType": "hive"
       }
     },
     {
@@ -2463,8 +2619,9 @@ where year=2009 and month>10
       "vertexId": "functional.alltypes.int_col",
       "id": 12,
       "metadata": {
-        "tableCreateTime": 1571175281,
-        "tableName": "functional.alltypes"
+        "tableCreateTime": 1687531267,
+        "tableName": "functional.alltypes",
+        "tableType": "hive"
       }
     },
     {
@@ -2472,8 +2629,9 @@ where year=2009 and month>10
       "vertexId": "bigint_col",
       "id": 13,
       "metadata": {
-        "tableCreateTime": 1571508465,
-        "tableName": "lineage_test_db.alltypessmall"
+        "tableCreateTime": 1687533490,
+        "tableName": "lineage_test_db.alltypessmall",
+        "tableType": "hive"
       }
     },
     {
@@ -2481,8 +2639,9 @@ where year=2009 and month>10
       "vertexId": "functional.alltypes.bigint_col",
       "id": 14,
       "metadata": {
-        "tableCreateTime": 1571175281,
-        "tableName": "functional.alltypes"
+        "tableCreateTime": 1687531267,
+        "tableName": "functional.alltypes",
+        "tableType": "hive"
       }
     },
     {
@@ -2490,8 +2649,9 @@ where year=2009 and month>10
       "vertexId": "float_col",
       "id": 15,
       "metadata": {
-        "tableCreateTime": 1571508465,
-        "tableName": "lineage_test_db.alltypessmall"
+        "tableCreateTime": 1687533490,
+        "tableName": "lineage_test_db.alltypessmall",
+        "tableType": "hive"
       }
     },
     {
@@ -2499,8 +2659,9 @@ where year=2009 and month>10
       "vertexId": "functional.alltypes.float_col",
       "id": 16,
       "metadata": {
-        "tableCreateTime": 1571175281,
-        "tableName": "functional.alltypes"
+        "tableCreateTime": 1687531267,
+        "tableName": "functional.alltypes",
+        "tableType": "hive"
       }
     },
     {
@@ -2508,8 +2669,9 @@ where year=2009 and month>10
       "vertexId": "double_col",
       "id": 17,
       "metadata": {
-        "tableCreateTime": 1571508465,
-        "tableName": "lineage_test_db.alltypessmall"
+        "tableCreateTime": 1687533490,
+        "tableName": "lineage_test_db.alltypessmall",
+        "tableType": "hive"
       }
     },
     {
@@ -2517,8 +2679,9 @@ where year=2009 and month>10
       "vertexId": "functional.alltypes.double_col",
       "id": 18,
       "metadata": {
-        "tableCreateTime": 1571175281,
-        "tableName": "functional.alltypes"
+        "tableCreateTime": 1687531267,
+        "tableName": "functional.alltypes",
+        "tableType": "hive"
       }
     },
     {
@@ -2526,8 +2689,9 @@ where year=2009 and month>10
       "vertexId": "date_string_col",
       "id": 19,
       "metadata": {
-        "tableCreateTime": 1571508465,
-        "tableName": "lineage_test_db.alltypessmall"
+        "tableCreateTime": 1687533490,
+        "tableName": "lineage_test_db.alltypessmall",
+        "tableType": "hive"
       }
     },
     {
@@ -2535,8 +2699,9 @@ where year=2009 and month>10
       "vertexId": "functional.alltypes.date_string_col",
       "id": 20,
       "metadata": {
-        "tableCreateTime": 1571175281,
-        "tableName": "functional.alltypes"
+        "tableCreateTime": 1687531267,
+        "tableName": "functional.alltypes",
+        "tableType": "hive"
       }
     },
     {
@@ -2544,8 +2709,9 @@ where year=2009 and month>10
       "vertexId": "string_col",
       "id": 21,
       "metadata": {
-        "tableCreateTime": 1571508465,
-        "tableName": "lineage_test_db.alltypessmall"
+        "tableCreateTime": 1687533490,
+        "tableName": "lineage_test_db.alltypessmall",
+        "tableType": "hive"
       }
     },
     {
@@ -2553,8 +2719,9 @@ where year=2009 and month>10
       "vertexId": "functional.alltypes.string_col",
       "id": 22,
       "metadata": {
-        "tableCreateTime": 1571175281,
-        "tableName": "functional.alltypes"
+        "tableCreateTime": 1687531267,
+        "tableName": "functional.alltypes",
+        "tableType": "hive"
       }
     },
     {
@@ -2562,8 +2729,9 @@ where year=2009 and month>10
       "vertexId": "timestamp_col",
       "id": 23,
       "metadata": {
-        "tableCreateTime": 1571508465,
-        "tableName": "lineage_test_db.alltypessmall"
+        "tableCreateTime": 1687533490,
+        "tableName": "lineage_test_db.alltypessmall",
+        "tableType": "hive"
       }
     },
     {
@@ -2571,8 +2739,9 @@ where year=2009 and month>10
       "vertexId": "functional.alltypes.timestamp_col",
       "id": 24,
       "metadata": {
-        "tableCreateTime": 1571175281,
-        "tableName": "functional.alltypes"
+        "tableCreateTime": 1687531267,
+        "tableName": "functional.alltypes",
+        "tableType": "hive"
       }
     },
     {
@@ -2580,8 +2749,9 @@ where year=2009 and month>10
       "vertexId": "functional.alltypes.year",
       "id": 25,
       "metadata": {
-        "tableCreateTime": 1571175281,
-        "tableName": "functional.alltypes"
+        "tableCreateTime": 1687531267,
+        "tableName": "functional.alltypes",
+        "tableType": "hive"
       }
     }
   ],
@@ -2725,10 +2895,10 @@ where year=2009 and month>10
       "edgeType": "PREDICATE"
     }
   ],
-  "queryId": "5e4e1056fd8287ac:0ee1847500000000",
+  "queryId": "e64b728b24bbd5e9:d50607e600000000",
   "user": "anurag",
   "queryText": "insert into table lineage_test_db.alltypessmall partition (year=2009, month) select min(id), min(bool_col), min(tinyint_col), min(smallint_col), min(int_col), min(bigint_col), min(float_col), min(double_col), min(date_string_col), min(string_col), min(timestamp_col), month from functional.alltypes where year=2009 and month>10 group by month having min(id) > 10",
-  "endTime": 1571508549
+  "endTime": 1687533567
 }
 ---- QUERY
 insert into table lineage_test_db.alltypessmall
@@ -2744,7 +2914,7 @@ having min(id) > 10
 ---- LINEAGE
 {
   "hash": "c82935c5165916f6c56db043120b1b45",
-  "timestamp": 1571508554,
+  "timestamp": 1687533572,
   "vertices": [
     {
       "vertexType": "COLUMN",
@@ -2756,8 +2926,9 @@ having min(id) > 10
       "vertexId": "functional.alltypes.tinyint_col",
       "id": 1,
       "metadata": {
-        "tableCreateTime": 1571175281,
-        "tableName": "functional.alltypes"
+        "tableCreateTime": 1687531267,
+        "tableName": "functional.alltypes",
+        "tableType": "hive"
       }
     },
     {
@@ -2765,8 +2936,9 @@ having min(id) > 10
       "vertexId": "functional.alltypes.int_col",
       "id": 2,
       "metadata": {
-        "tableCreateTime": 1571175281,
-        "tableName": "functional.alltypes"
+        "tableCreateTime": 1687531267,
+        "tableName": "functional.alltypes",
+        "tableType": "hive"
       }
     }
   ],
@@ -2790,10 +2962,10 @@ having min(id) > 10
       "edgeType": "PREDICATE"
     }
   ],
-  "queryId": "ca4eb4dcd9be24d8:59f4b26c00000000",
+  "queryId": "b4403b6c2b81f788:b8af2f7700000000",
   "user": "anurag",
   "queryText": "select max(tinyint_col) over(partition by int_col) from functional.alltypes group by int_col, tinyint_col",
-  "endTime": 1571508554
+  "endTime": 1687533573
 }
 ---- QUERY
 # Select statements with analytic functions
@@ -2805,7 +2977,7 @@ group by int_col, tinyint_col
 ---- LINEAGE
 {
   "hash": "6c646de10e62d1155b5216ae8589ff6d",
-  "timestamp": 1571508560,
+  "timestamp": 1687533578,
   "vertices": [
     {
       "vertexType": "COLUMN",
@@ -2817,8 +2989,9 @@ group by int_col, tinyint_col
       "vertexId": "functional.alltypesagg.int_col",
       "id": 1,
       "metadata": {
-        "tableCreateTime": 1571172137,
-        "tableName": "functional.alltypesagg"
+        "tableCreateTime": 1687531275,
+        "tableName": "functional.alltypesagg",
+        "tableType": "hive"
       }
     },
     {
@@ -2854,10 +3027,10 @@ group by int_col, tinyint_col
       "edgeType": "PREDICATE"
     }
   ],
-  "queryId": "bb405c0eac26f5f4:eefbb34a00000000",
+  "queryId": "fb4794254fb75b20:d1daf37500000000",
   "user": "anurag",
   "queryText": "select int_col, rank() over(order by int_col) from functional.alltypesagg",
-  "endTime": 1571508560
+  "endTime": 1687533578
 }
 ---- QUERY
 select int_col, rank() over(order by int_col) from functional.alltypesagg
@@ -2865,7 +3038,7 @@ select int_col, rank() over(order by int_col) from functional.alltypesagg
 ---- LINEAGE
 {
   "hash": "3c1677d7fcf4b2db27e84f30f5b3e96f",
-  "timestamp": 1571508565,
+  "timestamp": 1687533583,
   "vertices": [
     {
       "vertexType": "COLUMN",
@@ -2877,8 +3050,9 @@ select int_col, rank() over(order by int_col) from functional.alltypesagg
       "vertexId": "functional.alltypes.tinyint_col",
       "id": 1,
       "metadata": {
-        "tableCreateTime": 1571175281,
-        "tableName": "functional.alltypes"
+        "tableCreateTime": 1687531267,
+        "tableName": "functional.alltypes",
+        "tableType": "hive"
       }
     },
     {
@@ -2891,8 +3065,9 @@ select int_col, rank() over(order by int_col) from functional.alltypesagg
       "vertexId": "functional.alltypes.int_col",
       "id": 3,
       "metadata": {
-        "tableCreateTime": 1571175281,
-        "tableName": "functional.alltypes"
+        "tableCreateTime": 1687531267,
+        "tableName": "functional.alltypes",
+        "tableType": "hive"
       }
     },
     {
@@ -2905,8 +3080,9 @@ select int_col, rank() over(order by int_col) from functional.alltypesagg
       "vertexId": "functional.alltypes.double_col",
       "id": 5,
       "metadata": {
-        "tableCreateTime": 1571175281,
-        "tableName": "functional.alltypes"
+        "tableCreateTime": 1687531267,
+        "tableName": "functional.alltypes",
+        "tableType": "hive"
       }
     },
     {
@@ -2914,8 +3090,9 @@ select int_col, rank() over(order by int_col) from functional.alltypesagg
       "vertexId": "functional.alltypes.id",
       "id": 6,
       "metadata": {
-        "tableCreateTime": 1571175281,
-        "tableName": "functional.alltypes"
+        "tableCreateTime": 1687531267,
+        "tableName": "functional.alltypes",
+        "tableType": "hive"
       }
     },
     {
@@ -2923,8 +3100,9 @@ select int_col, rank() over(order by int_col) from functional.alltypesagg
       "vertexId": "functional.alltypessmall.id",
       "id": 7,
       "metadata": {
-        "tableCreateTime": 1571172085,
-        "tableName": "functional.alltypessmall"
+        "tableCreateTime": 1687531269,
+        "tableName": "functional.alltypessmall",
+        "tableType": "hive"
       }
     }
   ],
@@ -2979,10 +3157,10 @@ select int_col, rank() over(order by int_col) from functional.alltypesagg
       "edgeType": "PREDICATE"
     }
   ],
-  "queryId": "ae44be2f241c986d:31c15abf00000000",
+  "queryId": "8d4ddc6897bb8c9f:2f295b1700000000",
   "user": "anurag",
   "queryText": "select a.tinyint_col, a.int_col, count(a.double_col)   over(partition by a.tinyint_col order by a.int_col desc rows between 1 preceding and 1 following) from functional.alltypes a inner join functional.alltypessmall b on a.id = b.id order by a.tinyint_col, a.int_col",
-  "endTime": 1571508566
+  "endTime": 1687533583
 }
 ---- QUERY
 select a.tinyint_col, a.int_col, count(a.double_col)
@@ -2993,7 +3171,7 @@ order by a.tinyint_col, a.int_col
 ---- LINEAGE
 {
   "hash": "547ead4bd734c7e6720ba5df3f7da88c",
-  "timestamp": 1571508571,
+  "timestamp": 1687533588,
   "vertices": [
     {
       "vertexType": "COLUMN",
@@ -3005,8 +3183,9 @@ order by a.tinyint_col, a.int_col
       "vertexId": "functional.alltypes.double_col",
       "id": 1,
       "metadata": {
-        "tableCreateTime": 1571175281,
-        "tableName": "functional.alltypes"
+        "tableCreateTime": 1687531267,
+        "tableName": "functional.alltypes",
+        "tableType": "hive"
       }
     },
     {
@@ -3019,8 +3198,9 @@ order by a.tinyint_col, a.int_col
       "vertexId": "functional.alltypes.int_col",
       "id": 3,
       "metadata": {
-        "tableCreateTime": 1571175281,
-        "tableName": "functional.alltypes"
+        "tableCreateTime": 1687531267,
+        "tableName": "functional.alltypes",
+        "tableType": "hive"
       }
     },
     {
@@ -3033,8 +3213,9 @@ order by a.tinyint_col, a.int_col
       "vertexId": "functional.alltypes.bigint_col",
       "id": 5,
       "metadata": {
-        "tableCreateTime": 1571175281,
-        "tableName": "functional.alltypes"
+        "tableCreateTime": 1687531267,
+        "tableName": "functional.alltypes",
+        "tableType": "hive"
       }
     },
     {
@@ -3042,8 +3223,9 @@ order by a.tinyint_col, a.int_col
       "vertexId": "functional.alltypes.bool_col",
       "id": 6,
       "metadata": {
-        "tableCreateTime": 1571175281,
-        "tableName": "functional.alltypes"
+        "tableCreateTime": 1687531267,
+        "tableName": "functional.alltypes",
+        "tableType": "hive"
       }
     },
     {
@@ -3125,10 +3307,10 @@ order by a.tinyint_col, a.int_col
       "edgeType": "PROJECTION"
     }
   ],
-  "queryId": "054bea589253d94c:82fb1bae00000000",
+  "queryId": "c14107654ce903b7:9bd3363200000000",
   "user": "anurag",
   "queryText": "with v2 as   (select    double_col,    count(int_col) over() a,    sum(int_col + bigint_col) over(partition by bool_col) b    from      (select * from functional.alltypes) v1) select double_col, a, b, a + b, double_col + a from v2 order by 2, 3, 4",
-  "endTime": 1571508571
+  "endTime": 1687533589
 }
 ---- QUERY
 with v2 as
@@ -3144,7 +3326,7 @@ order by 2, 3, 4
 ---- LINEAGE
 {
   "hash": "952f8a7042ff661ed34fbc8167349899",
-  "timestamp": 1571508576,
+  "timestamp": 1687533594,
   "vertices": [
     {
       "vertexType": "COLUMN",
@@ -3156,8 +3338,9 @@ order by 2, 3, 4
       "vertexId": "functional.alltypes.double_col",
       "id": 1,
       "metadata": {
-        "tableCreateTime": 1571175281,
-        "tableName": "functional.alltypes"
+        "tableCreateTime": 1687531267,
+        "tableName": "functional.alltypes",
+        "tableType": "hive"
       }
     },
     {
@@ -3170,8 +3353,9 @@ order by 2, 3, 4
       "vertexId": "functional.alltypes.int_col",
       "id": 3,
       "metadata": {
-        "tableCreateTime": 1571175281,
-        "tableName": "functional.alltypes"
+        "tableCreateTime": 1687531267,
+        "tableName": "functional.alltypes",
+        "tableType": "hive"
       }
     },
     {
@@ -3184,8 +3368,9 @@ order by 2, 3, 4
       "vertexId": "functional.alltypes.bigint_col",
       "id": 5,
       "metadata": {
-        "tableCreateTime": 1571175281,
-        "tableName": "functional.alltypes"
+        "tableCreateTime": 1687531267,
+        "tableName": "functional.alltypes",
+        "tableType": "hive"
       }
     },
     {
@@ -3193,8 +3378,9 @@ order by 2, 3, 4
       "vertexId": "functional.alltypes.bool_col",
       "id": 6,
       "metadata": {
-        "tableCreateTime": 1571175281,
-        "tableName": "functional.alltypes"
+        "tableCreateTime": 1687531267,
+        "tableName": "functional.alltypes",
+        "tableType": "hive"
       }
     },
     {
@@ -3276,10 +3462,10 @@ order by 2, 3, 4
       "edgeType": "PROJECTION"
     }
   ],
-  "queryId": "a942e08210071938:5a00a1e800000000",
+  "queryId": "1744e089e7cc73a9:ed50bff000000000",
   "user": "anurag",
   "queryText": "select double_col, a, b, a + b, double_col + a from   (select    double_col,    count(int_col) over() a,    sum(int_col + bigint_col) over(partition by bool_col) b    from      (select * from functional.alltypes) v1) v2 order by 2, 3, 4",
-  "endTime": 1571508576
+  "endTime": 1687533594
 }
 ---- QUERY
 select double_col, a, b, a + b, double_col + a from
@@ -3294,7 +3480,7 @@ order by 2, 3, 4
 ---- LINEAGE
 {
   "hash": "7b677a184cce15efd15f3033b9b2feeb",
-  "timestamp": 1571508581,
+  "timestamp": 1687533599,
   "vertices": [
     {
       "vertexType": "COLUMN",
@@ -3306,8 +3492,9 @@ order by 2, 3, 4
       "vertexId": "functional.alltypes.month",
       "id": 1,
       "metadata": {
-        "tableCreateTime": 1571175281,
-        "tableName": "functional.alltypes"
+        "tableCreateTime": 1687531267,
+        "tableName": "functional.alltypes",
+        "tableType": "hive"
       }
     },
     {
@@ -3320,8 +3507,9 @@ order by 2, 3, 4
       "vertexId": "functional.alltypes.year",
       "id": 3,
       "metadata": {
-        "tableCreateTime": 1571175281,
-        "tableName": "functional.alltypes"
+        "tableCreateTime": 1687531267,
+        "tableName": "functional.alltypes",
+        "tableType": "hive"
       }
     },
     {
@@ -3334,8 +3522,9 @@ order by 2, 3, 4
       "vertexId": "functional.alltypessmall.int_col",
       "id": 5,
       "metadata": {
-        "tableCreateTime": 1571172085,
-        "tableName": "functional.alltypessmall"
+        "tableCreateTime": 1687531269,
+        "tableName": "functional.alltypessmall",
+        "tableType": "hive"
       }
     },
     {
@@ -3343,8 +3532,9 @@ order by 2, 3, 4
       "vertexId": "functional.alltypessmall.month",
       "id": 6,
       "metadata": {
-        "tableCreateTime": 1571172085,
-        "tableName": "functional.alltypessmall"
+        "tableCreateTime": 1687531269,
+        "tableName": "functional.alltypessmall",
+        "tableType": "hive"
       }
     }
   ],
@@ -3398,10 +3588,10 @@ order by 2, 3, 4
       "edgeType": "PREDICATE"
     }
   ],
-  "queryId": "f340737f0f5a5a7c:e1f8020300000000",
+  "queryId": "4740735360ac58fe:543457eb00000000",
   "user": "anurag",
   "queryText": "select a.month, a.year, b.int_col, b.month from   (select year, month from functional.alltypes    union all    select year, month from functional.alltypes) a   inner join   functional.alltypessmall b   on (a.month = b.month) where b.month = 1",
-  "endTime": 1571508582
+  "endTime": 1687533599
 }
 ---- QUERY
 # Union statements
@@ -3418,7 +3608,7 @@ where b.month = 1
 ---- LINEAGE
 {
   "hash": "2f2aab8dd7a5ca2112311dc4bc676e5d",
-  "timestamp": 1571508587,
+  "timestamp": 1687533604,
   "vertices": [
     {
       "vertexType": "COLUMN",
@@ -3430,8 +3620,9 @@ where b.month = 1
       "vertexId": "functional.alltypessmall.int_col",
       "id": 1,
       "metadata": {
-        "tableCreateTime": 1571172085,
-        "tableName": "functional.alltypessmall"
+        "tableCreateTime": 1687531269,
+        "tableName": "functional.alltypessmall",
+        "tableType": "hive"
       }
     },
     {
@@ -3444,8 +3635,9 @@ where b.month = 1
       "vertexId": "functional.alltypes.month",
       "id": 3,
       "metadata": {
-        "tableCreateTime": 1571175281,
-        "tableName": "functional.alltypes"
+        "tableCreateTime": 1687531267,
+        "tableName": "functional.alltypes",
+        "tableType": "hive"
       }
     },
     {
@@ -3458,8 +3650,9 @@ where b.month = 1
       "vertexId": "functional.alltypes.int_col",
       "id": 5,
       "metadata": {
-        "tableCreateTime": 1571175281,
-        "tableName": "functional.alltypes"
+        "tableCreateTime": 1687531267,
+        "tableName": "functional.alltypes",
+        "tableType": "hive"
       }
     },
     {
@@ -3467,8 +3660,9 @@ where b.month = 1
       "vertexId": "functional.alltypessmall.month",
       "id": 6,
       "metadata": {
-        "tableCreateTime": 1571172085,
-        "tableName": "functional.alltypessmall"
+        "tableCreateTime": 1687531269,
+        "tableName": "functional.alltypessmall",
+        "tableType": "hive"
       }
     }
   ],
@@ -3515,10 +3709,10 @@ where b.month = 1
       "edgeType": "PREDICATE"
     }
   ],
-  "queryId": "3342a4c38b48f764:9fc9ef0f00000000",
+  "queryId": "704c9e102ed9744a:97d7530700000000",
   "user": "anurag",
   "queryText": "select t1.int_col, t2.month, t2.int_col + 1 from (   select int_col, count(*)   from functional.alltypessmall   where month = 1   group by int_col   having count(*) > 1   order by count(*) desc limit 5   ) t1 join functional.alltypes t2 on (t1.int_col = t2.int_col) where month = 1",
-  "endTime": 1571508587
+  "endTime": 1687533604
 }
 ---- QUERY
 # Select statements with inline views
@@ -3537,7 +3731,7 @@ where month = 1
 ---- LINEAGE
 {
   "hash": "d86f371388b5a5024bca2b7fc487d8f7",
-  "timestamp": 1571508592,
+  "timestamp": 1687533609,
   "vertices": [
     {
       "vertexType": "COLUMN",
@@ -3549,8 +3743,9 @@ where month = 1
       "vertexId": "functional.alltypesagg.smallint_col",
       "id": 1,
       "metadata": {
-        "tableCreateTime": 1571172137,
-        "tableName": "functional.alltypesagg"
+        "tableCreateTime": 1687531275,
+        "tableName": "functional.alltypesagg",
+        "tableType": "hive"
       }
     },
     {
@@ -3563,8 +3758,9 @@ where month = 1
       "vertexId": "functional.alltypessmall.id",
       "id": 3,
       "metadata": {
-        "tableCreateTime": 1571172085,
-        "tableName": "functional.alltypessmall"
+        "tableCreateTime": 1687531269,
+        "tableName": "functional.alltypessmall",
+        "tableType": "hive"
       }
     },
     {
@@ -3577,8 +3773,9 @@ where month = 1
       "vertexId": "functional.alltypesagg.tinyint_col",
       "id": 5,
       "metadata": {
-        "tableCreateTime": 1571172137,
-        "tableName": "functional.alltypesagg"
+        "tableCreateTime": 1687531275,
+        "tableName": "functional.alltypesagg",
+        "tableType": "hive"
       }
     },
     {
@@ -3591,8 +3788,9 @@ where month = 1
       "vertexId": "functional.alltypesagg.int_col",
       "id": 7,
       "metadata": {
-        "tableCreateTime": 1571172137,
-        "tableName": "functional.alltypesagg"
+        "tableCreateTime": 1687531275,
+        "tableName": "functional.alltypesagg",
+        "tableType": "hive"
       }
     },
     {
@@ -3605,8 +3803,9 @@ where month = 1
       "vertexId": "functional.alltypessmall.float_col",
       "id": 9,
       "metadata": {
-        "tableCreateTime": 1571172085,
-        "tableName": "functional.alltypessmall"
+        "tableCreateTime": 1687531269,
+        "tableName": "functional.alltypessmall",
+        "tableType": "hive"
       }
     },
     {
@@ -3619,8 +3818,9 @@ where month = 1
       "vertexId": "functional.alltypessmall.string_col",
       "id": 11,
       "metadata": {
-        "tableCreateTime": 1571172085,
-        "tableName": "functional.alltypessmall"
+        "tableCreateTime": 1687531269,
+        "tableName": "functional.alltypessmall",
+        "tableType": "hive"
       }
     },
     {
@@ -3628,8 +3828,9 @@ where month = 1
       "vertexId": "functional.alltypesagg.day",
       "id": 12,
       "metadata": {
-        "tableCreateTime": 1571172137,
-        "tableName": "functional.alltypesagg"
+        "tableCreateTime": 1687531275,
+        "tableName": "functional.alltypesagg",
+        "tableType": "hive"
       }
     },
     {
@@ -3637,8 +3838,9 @@ where month = 1
       "vertexId": "functional.alltypesagg.month",
       "id": 13,
       "metadata": {
-        "tableCreateTime": 1571172137,
-        "tableName": "functional.alltypesagg"
+        "tableCreateTime": 1687531275,
+        "tableName": "functional.alltypesagg",
+        "tableType": "hive"
       }
     }
   ],
@@ -3728,10 +3930,10 @@ where month = 1
       "edgeType": "PREDICATE"
     }
   ],
-  "queryId": "9f4bf31f2f1c6362:cd7abf3600000000",
+  "queryId": "d5413148c4203ab5:24a6dc2f00000000",
   "user": "anurag",
   "queryText": "select x.smallint_col, x.id, x.tinyint_col, c.id, x.int_col, x.float_col, c.string_col from functional.alltypessmall c join (    select a.smallint_col smallint_col, a.tinyint_col tinyint_col, a.day day,            a.int_col int_col, a.month month, b.float_col float_col, b.id id    from ( select * from functional.alltypesagg a where month=1 ) a    join functional.alltypessmall b on (a.smallint_col = b.id)  ) x on (x.tinyint_col = c.id) where x.day=1 and x.int_col > 899 and [...]
-  "endTime": 1571508593
+  "endTime": 1687533610
 }
 ---- QUERY
 select x.smallint_col, x.id, x.tinyint_col, c.id, x.int_col, x.float_col, c.string_col
@@ -3751,7 +3953,7 @@ and x.int_col + x.float_col + cast(c.string_col as float) < 1000
 ---- LINEAGE
 {
   "hash": "38cda699ddffba2fa5bab14c8a9c4fb4",
-  "timestamp": 1571508598,
+  "timestamp": 1687533615,
   "vertices": [
     {
       "vertexType": "COLUMN",
@@ -3763,8 +3965,9 @@ and x.int_col + x.float_col + cast(c.string_col as float) < 1000
       "vertexId": "functional_hbase.alltypessmall.int_col",
       "id": 1,
       "metadata": {
-        "tableCreateTime": 1571172706,
-        "tableName": "functional_hbase.alltypessmall"
+        "tableCreateTime": 1687531613,
+        "tableName": "functional_hbase.alltypessmall",
+        "tableType": "hbase"
       }
     },
     {
@@ -3777,8 +3980,9 @@ and x.int_col + x.float_col + cast(c.string_col as float) < 1000
       "vertexId": "functional_hbase.alltypessmall.float_col",
       "id": 3,
       "metadata": {
-        "tableCreateTime": 1571172706,
-        "tableName": "functional_hbase.alltypessmall"
+        "tableCreateTime": 1687531613,
+        "tableName": "functional_hbase.alltypessmall",
+        "tableType": "hbase"
       }
     },
     {
@@ -3828,10 +4032,10 @@ and x.int_col + x.float_col + cast(c.string_col as float) < 1000
       "edgeType": "PREDICATE"
     }
   ],
-  "queryId": "104e75ae4804d393:0359fc8000000000",
+  "queryId": "d94c43f20a44f454:87b6d0d300000000",
   "user": "anurag",
   "queryText": "select c1, c2, c3 from   (select c1, c2, c3    from      (select int_col c1, sum(float_col) c2, min(float_col) c3       from functional_hbase.alltypessmall       group by 1) x     order by 2,3 desc     limit 5 ) y",
-  "endTime": 1571508598
+  "endTime": 1687533616
 }
 ---- QUERY
 select c1, c2, c3
@@ -3848,7 +4052,7 @@ from
 ---- LINEAGE
 {
   "hash": "4e0d48d11ef88837d0267a212fb67716",
-  "timestamp": 1571508604,
+  "timestamp": 1687533621,
   "vertices": [
     {
       "vertexType": "COLUMN",
@@ -3860,8 +4064,9 @@ from
       "vertexId": "functional_hbase.alltypessmall.int_col",
       "id": 1,
       "metadata": {
-        "tableCreateTime": 1571172706,
-        "tableName": "functional_hbase.alltypessmall"
+        "tableCreateTime": 1687531613,
+        "tableName": "functional_hbase.alltypessmall",
+        "tableType": "hbase"
       }
     },
     {
@@ -3874,8 +4079,9 @@ from
       "vertexId": "functional_hbase.alltypessmall.tinyint_col",
       "id": 3,
       "metadata": {
-        "tableCreateTime": 1571172706,
-        "tableName": "functional_hbase.alltypessmall"
+        "tableCreateTime": 1687531613,
+        "tableName": "functional_hbase.alltypessmall",
+        "tableType": "hbase"
       }
     }
   ],
@@ -3910,10 +4116,10 @@ from
       "edgeType": "PREDICATE"
     }
   ],
-  "queryId": "764b5090c1d0c1bd:c02d06b000000000",
+  "queryId": "674320549904c2a7:e85c13d400000000",
   "user": "anurag",
   "queryText": "select c1, x2 from (   select c1, min(c2) x2   from (     select c1, c2, c3     from (       select int_col c1, tinyint_col c2, min(float_col) c3       from functional_hbase.alltypessmall       group by 1, 2       order by 1,2       limit 1     ) x   ) x2   group by c1 ) y order by 2,1 desc limit 0",
-  "endTime": 1571508604
+  "endTime": 1687533621
 }
 ---- QUERY
 select c1, x2
@@ -3937,7 +4143,7 @@ limit 0
 ---- LINEAGE
 {
   "hash": "073a1917cdbbb2b53ac89c62d0852270",
-  "timestamp": 1571508609,
+  "timestamp": 1687533626,
   "vertices": [
     {
       "vertexType": "COLUMN",
@@ -3949,8 +4155,9 @@ limit 0
       "vertexId": "functional.alltypes.id",
       "id": 1,
       "metadata": {
-        "tableCreateTime": 1571175281,
-        "tableName": "functional.alltypes"
+        "tableCreateTime": 1687531267,
+        "tableName": "functional.alltypes",
+        "tableType": "hive"
       }
     }
   ],
@@ -3965,10 +4172,10 @@ limit 0
       "edgeType": "PROJECTION"
     }
   ],
-  "queryId": "a04a81a6265056ed:0b50f93200000000",
+  "queryId": "1f45c1b8f43f6b96:a19ff31600000000",
   "user": "anurag",
   "queryText": "select id from functional.view_view",
-  "endTime": 1571508609
+  "endTime": 1687533626
 }
 ---- QUERY
 # Views
@@ -3977,7 +4184,7 @@ select id from functional.view_view
 ---- LINEAGE
 {
   "hash": "b0ebbaee6fd5fcc500e03aa8dbb08707",
-  "timestamp": 1571508614,
+  "timestamp": 1687533631,
   "vertices": [
     {
       "vertexType": "COLUMN",
@@ -3989,8 +4196,9 @@ select id from functional.view_view
       "vertexId": "functional.alltypes.id",
       "id": 1,
       "metadata": {
-        "tableCreateTime": 1571175281,
-        "tableName": "functional.alltypes"
+        "tableCreateTime": 1687531267,
+        "tableName": "functional.alltypes",
+        "tableType": "hive"
       }
     }
   ],
@@ -4014,10 +4222,10 @@ select id from functional.view_view
       "edgeType": "PREDICATE"
     }
   ],
-  "queryId": "db445bcc830329d4:ba5c19a300000000",
+  "queryId": "b7476b57060dceb7:b59a484600000000",
   "user": "anurag",
   "queryText": "select t.id from (select id from functional.alltypes_view) t where t.id < 10",
-  "endTime": 1571508614
+  "endTime": 1687533631
 }
 ---- QUERY
 select t.id from (select id from functional.alltypes_view) t
@@ -4026,7 +4234,7 @@ where t.id < 10
 ---- LINEAGE
 {
   "hash": "70664c8c26f6a2da7c7f53c4b97b8892",
-  "timestamp": 1571508619,
+  "timestamp": 1687533636,
   "vertices": [
     {
       "vertexType": "COLUMN",
@@ -4038,8 +4246,9 @@ where t.id < 10
       "vertexId": "functional.alltypes.string_col",
       "id": 1,
       "metadata": {
-        "tableCreateTime": 1571175281,
-        "tableName": "functional.alltypes"
+        "tableCreateTime": 1687531267,
+        "tableName": "functional.alltypes",
+        "tableType": "hive"
       }
     },
     {
@@ -4052,8 +4261,9 @@ where t.id < 10
       "vertexId": "functional.alltypes.float_col",
       "id": 3,
       "metadata": {
-        "tableCreateTime": 1571175281,
-        "tableName": "functional.alltypes"
+        "tableCreateTime": 1687531267,
+        "tableName": "functional.alltypes",
+        "tableType": "hive"
       }
     },
     {
@@ -4066,8 +4276,9 @@ where t.id < 10
       "vertexId": "functional.alltypes.bool_col",
       "id": 5,
       "metadata": {
-        "tableCreateTime": 1571175281,
-        "tableName": "functional.alltypes"
+        "tableCreateTime": 1687531267,
+        "tableName": "functional.alltypes",
+        "tableType": "hive"
       }
     },
     {
@@ -4075,8 +4286,9 @@ where t.id < 10
       "vertexId": "functional.alltypes.id",
       "id": 6,
       "metadata": {
-        "tableCreateTime": 1571175281,
-        "tableName": "functional.alltypes"
+        "tableCreateTime": 1687531267,
+        "tableName": "functional.alltypes",
+        "tableType": "hive"
       }
     },
     {
@@ -4084,8 +4296,9 @@ where t.id < 10
       "vertexId": "functional.alltypesagg.id",
       "id": 7,
       "metadata": {
-        "tableCreateTime": 1571172137,
-        "tableName": "functional.alltypesagg"
+        "tableCreateTime": 1687531275,
+        "tableName": "functional.alltypesagg",
+        "tableType": "hive"
       }
     }
   ],
@@ -4130,10 +4343,10 @@ where t.id < 10
       "edgeType": "PREDICATE"
     }
   ],
-  "queryId": "c74cad8af7ffad25:6e4c9a7a00000000",
+  "queryId": "09489cc02e60feec:c8ddfb0b00000000",
   "user": "anurag",
   "queryText": "select string_col, float_col, bool_col from functional.alltypes where id in   (select id from functional.alltypesagg)",
-  "endTime": 1571508620
+  "endTime": 1687533637
 }
 ---- QUERY
 # Subqueries
@@ -4145,7 +4358,7 @@ where id in
 ---- LINEAGE
 {
   "hash": "97267ebbbeae23fa3bb8ddeb8375e7b9",
-  "timestamp": 1571508625,
+  "timestamp": 1687533642,
   "vertices": [
     {
       "vertexType": "COLUMN",
@@ -4157,8 +4370,9 @@ where id in
       "vertexId": "functional.alltypesagg.tinyint_col",
       "id": 1,
       "metadata": {
-        "tableCreateTime": 1571172137,
-        "tableName": "functional.alltypesagg"
+        "tableCreateTime": 1687531275,
+        "tableName": "functional.alltypesagg",
+        "tableType": "hive"
       }
     },
     {
@@ -4166,8 +4380,9 @@ where id in
       "vertexId": "functional.alltypestiny.tinyint_col",
       "id": 2,
       "metadata": {
-        "tableCreateTime": 1571172091,
-        "tableName": "functional.alltypestiny"
+        "tableCreateTime": 1687531270,
+        "tableName": "functional.alltypestiny",
+        "tableType": "hive"
       }
     }
   ],
@@ -4190,10 +4405,10 @@ where id in
       "edgeType": "PREDICATE"
     }
   ],
-  "queryId": "564e0392a35a1590:c102f3f900000000",
+  "queryId": "684366081fd04903:ce9b652700000000",
   "user": "anurag",
   "queryText": "select 1 from functional.alltypesagg a where exists   (select id, count(int_col) over (partition by bool_col)    from functional.alltypestiny b    where a.tinyint_col = b.tinyint_col    group by id, int_col, bool_col) and tinyint_col < 10",
-  "endTime": 1571508625
+  "endTime": 1687533642
 }
 ---- QUERY
 select 1
@@ -4208,7 +4423,7 @@ and tinyint_col < 10
 ---- LINEAGE
 {
   "hash": "b59cc1541d8583e3f1359e9f48c0963d",
-  "timestamp": 1571508630,
+  "timestamp": 1687533647,
   "vertices": [
     {
       "vertexType": "COLUMN",
@@ -4220,8 +4435,9 @@ and tinyint_col < 10
       "vertexId": "functional.alltypes.int_col",
       "id": 1,
       "metadata": {
-        "tableCreateTime": 1571175281,
-        "tableName": "functional.alltypes"
+        "tableCreateTime": 1687531267,
+        "tableName": "functional.alltypes",
+        "tableType": "hive"
       }
     },
     {
@@ -4234,8 +4450,9 @@ and tinyint_col < 10
       "vertexId": "functional.alltypes.tinyint_col",
       "id": 3,
       "metadata": {
-        "tableCreateTime": 1571175281,
-        "tableName": "functional.alltypes"
+        "tableCreateTime": 1687531267,
+        "tableName": "functional.alltypes",
+        "tableType": "hive"
       }
     },
     {
@@ -4243,8 +4460,9 @@ and tinyint_col < 10
       "vertexId": "functional.alltypes.bigint_col",
       "id": 4,
       "metadata": {
-        "tableCreateTime": 1571175281,
-        "tableName": "functional.alltypes"
+        "tableCreateTime": 1687531267,
+        "tableName": "functional.alltypes",
+        "tableType": "hive"
       }
     },
     {
@@ -4252,8 +4470,9 @@ and tinyint_col < 10
       "vertexId": "functional.alltypesagg.bool_col",
       "id": 5,
       "metadata": {
-        "tableCreateTime": 1571172137,
-        "tableName": "functional.alltypesagg"
+        "tableCreateTime": 1687531275,
+        "tableName": "functional.alltypesagg",
+        "tableType": "hive"
       }
     },
     {
@@ -4261,8 +4480,9 @@ and tinyint_col < 10
       "vertexId": "functional.alltypesagg.int_col",
       "id": 6,
       "metadata": {
-        "tableCreateTime": 1571172137,
-        "tableName": "functional.alltypesagg"
+        "tableCreateTime": 1687531275,
+        "tableName": "functional.alltypesagg",
+        "tableType": "hive"
       }
     }
   ],
@@ -4299,10 +4519,10 @@ and tinyint_col < 10
       "edgeType": "PREDICATE"
     }
   ],
-  "queryId": "0e4439be9321f134:66210f4300000000",
+  "queryId": "bc4aa55c595aa11f:b69f692600000000",
   "user": "anurag",
   "queryText": "select int_col + 1, tinyint_col - 1 from functional.alltypes a where a.int_col <   (select max(int_col) from functional.alltypesagg g where g.bool_col = true) and a.bigint_col > 10",
-  "endTime": 1571508630
+  "endTime": 1687533647
 }
 ---- QUERY
 select int_col + 1, tinyint_col - 1
@@ -4314,7 +4534,7 @@ and a.bigint_col > 10
 ---- LINEAGE
 {
   "hash": "ff421b2c2b249764028350613be74fb8",
-  "timestamp": 1571508636,
+  "timestamp": 1687533652,
   "vertices": [
     {
       "vertexType": "COLUMN",
@@ -4326,8 +4546,9 @@ and a.bigint_col > 10
       "vertexId": "functional.alltypes.int_col",
       "id": 1,
       "metadata": {
-        "tableCreateTime": 1571175281,
-        "tableName": "functional.alltypes"
+        "tableCreateTime": 1687531267,
+        "tableName": "functional.alltypes",
+        "tableType": "hive"
       }
     },
     {
@@ -4340,8 +4561,9 @@ and a.bigint_col > 10
       "vertexId": "functional.alltypes.bigint_col",
       "id": 3,
       "metadata": {
-        "tableCreateTime": 1571175281,
-        "tableName": "functional.alltypes"
+        "tableCreateTime": 1687531267,
+        "tableName": "functional.alltypes",
+        "tableType": "hive"
       }
     }
   ],
@@ -4365,10 +4587,10 @@ and a.bigint_col > 10
       "edgeType": "PROJECTION"
     }
   ],
-  "queryId": "30433ec4beec363a:3d8db54f00000000",
+  "queryId": "a54406d43e4870fb:cf7baf2100000000",
   "user": "anurag",
   "queryText": "with t as (select int_col x, bigint_col y from functional.alltypes) select x, y from t",
-  "endTime": 1571508636
+  "endTime": 1687533652
 }
 ---- QUERY
 # With clause
@@ -4377,15 +4599,16 @@ with t as (select int_col x, bigint_col y from functional.alltypes) select x, y
 ---- LINEAGE
 {
   "hash": "b2519388c17a48c91e5bb32948bce1c0",
-  "timestamp": 1571508641,
+  "timestamp": 1687533657,
   "vertices": [
     {
       "vertexType": "COLUMN",
       "vertexId": "year",
       "id": 0,
       "metadata": {
-        "tableCreateTime": 1571508466,
-        "tableName": "lineage_test_db.alltypesinsert"
+        "tableCreateTime": 1687533491,
+        "tableName": "lineage_test_db.alltypesinsert",
+        "tableType": "hive"
       }
     },
     {
@@ -4393,8 +4616,9 @@ with t as (select int_col x, bigint_col y from functional.alltypes) select x, y
       "vertexId": "functional.alltypestiny.year",
       "id": 1,
       "metadata": {
-        "tableCreateTime": 1571172091,
-        "tableName": "functional.alltypestiny"
+        "tableCreateTime": 1687531270,
+        "tableName": "functional.alltypestiny",
+        "tableType": "hive"
       }
     },
     {
@@ -4402,8 +4626,9 @@ with t as (select int_col x, bigint_col y from functional.alltypes) select x, y
       "vertexId": "month",
       "id": 2,
       "metadata": {
-        "tableCreateTime": 1571508466,
-        "tableName": "lineage_test_db.alltypesinsert"
+        "tableCreateTime": 1687533491,
+        "tableName": "lineage_test_db.alltypesinsert",
+        "tableType": "hive"
       }
     },
     {
@@ -4411,8 +4636,9 @@ with t as (select int_col x, bigint_col y from functional.alltypes) select x, y
       "vertexId": "functional.alltypestiny.month",
       "id": 3,
       "metadata": {
-        "tableCreateTime": 1571172091,
-        "tableName": "functional.alltypestiny"
+        "tableCreateTime": 1687531270,
+        "tableName": "functional.alltypestiny",
+        "tableType": "hive"
       }
     },
     {
@@ -4420,8 +4646,9 @@ with t as (select int_col x, bigint_col y from functional.alltypes) select x, y
       "vertexId": "id",
       "id": 4,
       "metadata": {
-        "tableCreateTime": 1571508466,
-        "tableName": "lineage_test_db.alltypesinsert"
+        "tableCreateTime": 1687533491,
+        "tableName": "lineage_test_db.alltypesinsert",
+        "tableType": "hive"
       }
     },
     {
@@ -4429,8 +4656,9 @@ with t as (select int_col x, bigint_col y from functional.alltypes) select x, y
       "vertexId": "functional.alltypestiny.id",
       "id": 5,
       "metadata": {
-        "tableCreateTime": 1571172091,
-        "tableName": "functional.alltypestiny"
+        "tableCreateTime": 1687531270,
+        "tableName": "functional.alltypestiny",
+        "tableType": "hive"
       }
     },
     {
@@ -4438,8 +4666,9 @@ with t as (select int_col x, bigint_col y from functional.alltypes) select x, y
       "vertexId": "bool_col",
       "id": 6,
       "metadata": {
-        "tableCreateTime": 1571508466,
-        "tableName": "lineage_test_db.alltypesinsert"
+        "tableCreateTime": 1687533491,
+        "tableName": "lineage_test_db.alltypesinsert",
+        "tableType": "hive"
       }
     },
     {
@@ -4447,8 +4676,9 @@ with t as (select int_col x, bigint_col y from functional.alltypes) select x, y
       "vertexId": "tinyint_col",
       "id": 7,
       "metadata": {
-        "tableCreateTime": 1571508466,
-        "tableName": "lineage_test_db.alltypesinsert"
+        "tableCreateTime": 1687533491,
+        "tableName": "lineage_test_db.alltypesinsert",
+        "tableType": "hive"
       }
     },
     {
@@ -4456,8 +4686,9 @@ with t as (select int_col x, bigint_col y from functional.alltypes) select x, y
       "vertexId": "smallint_col",
       "id": 8,
       "metadata": {
-        "tableCreateTime": 1571508466,
-        "tableName": "lineage_test_db.alltypesinsert"
+        "tableCreateTime": 1687533491,
+        "tableName": "lineage_test_db.alltypesinsert",
+        "tableType": "hive"
       }
     },
     {
@@ -4465,8 +4696,9 @@ with t as (select int_col x, bigint_col y from functional.alltypes) select x, y
       "vertexId": "int_col",
       "id": 9,
       "metadata": {
-        "tableCreateTime": 1571508466,
-        "tableName": "lineage_test_db.alltypesinsert"
+        "tableCreateTime": 1687533491,
+        "tableName": "lineage_test_db.alltypesinsert",
+        "tableType": "hive"
       }
     },
     {
@@ -4474,8 +4706,9 @@ with t as (select int_col x, bigint_col y from functional.alltypes) select x, y
       "vertexId": "functional.alltypestiny.int_col",
       "id": 10,
       "metadata": {
-        "tableCreateTime": 1571172091,
-        "tableName": "functional.alltypestiny"
+        "tableCreateTime": 1687531270,
+        "tableName": "functional.alltypestiny",
+        "tableType": "hive"
       }
     },
     {
@@ -4483,8 +4716,9 @@ with t as (select int_col x, bigint_col y from functional.alltypes) select x, y
       "vertexId": "bigint_col",
       "id": 11,
       "metadata": {
-        "tableCreateTime": 1571508466,
-        "tableName": "lineage_test_db.alltypesinsert"
+        "tableCreateTime": 1687533491,
+        "tableName": "lineage_test_db.alltypesinsert",
+        "tableType": "hive"
       }
     },
     {
@@ -4492,8 +4726,9 @@ with t as (select int_col x, bigint_col y from functional.alltypes) select x, y
       "vertexId": "float_col",
       "id": 12,
       "metadata": {
-        "tableCreateTime": 1571508466,
-        "tableName": "lineage_test_db.alltypesinsert"
+        "tableCreateTime": 1687533491,
+        "tableName": "lineage_test_db.alltypesinsert",
+        "tableType": "hive"
       }
     },
     {
@@ -4501,8 +4736,9 @@ with t as (select int_col x, bigint_col y from functional.alltypes) select x, y
       "vertexId": "double_col",
       "id": 13,
       "metadata": {
-        "tableCreateTime": 1571508466,
-        "tableName": "lineage_test_db.alltypesinsert"
+        "tableCreateTime": 1687533491,
+        "tableName": "lineage_test_db.alltypesinsert",
+        "tableType": "hive"
       }
     },
     {
@@ -4510,8 +4746,9 @@ with t as (select int_col x, bigint_col y from functional.alltypes) select x, y
       "vertexId": "date_string_col",
       "id": 14,
       "metadata": {
-        "tableCreateTime": 1571508466,
-        "tableName": "lineage_test_db.alltypesinsert"
+        "tableCreateTime": 1687533491,
+        "tableName": "lineage_test_db.alltypesinsert",
+        "tableType": "hive"
       }
     },
     {
@@ -4519,8 +4756,9 @@ with t as (select int_col x, bigint_col y from functional.alltypes) select x, y
       "vertexId": "string_col",
       "id": 15,
       "metadata": {
-        "tableCreateTime": 1571508466,
-        "tableName": "lineage_test_db.alltypesinsert"
+        "tableCreateTime": 1687533491,
+        "tableName": "lineage_test_db.alltypesinsert",
+        "tableType": "hive"
       }
     },
     {
@@ -4528,8 +4766,9 @@ with t as (select int_col x, bigint_col y from functional.alltypes) select x, y
       "vertexId": "functional.alltypestiny.string_col",
       "id": 16,
       "metadata": {
-        "tableCreateTime": 1571172091,
-        "tableName": "functional.alltypestiny"
+        "tableCreateTime": 1687531270,
+        "tableName": "functional.alltypestiny",
+        "tableType": "hive"
       }
     },
     {
@@ -4537,8 +4776,9 @@ with t as (select int_col x, bigint_col y from functional.alltypes) select x, y
       "vertexId": "timestamp_col",
       "id": 17,
       "metadata": {
-        "tableCreateTime": 1571508466,
-        "tableName": "lineage_test_db.alltypesinsert"
+        "tableCreateTime": 1687533491,
+        "tableName": "lineage_test_db.alltypesinsert",
+        "tableType": "hive"
       }
     }
   ],
@@ -4645,10 +4885,10 @@ with t as (select int_col x, bigint_col y from functional.alltypes) select x, y
       "edgeType": "PROJECTION"
     }
   ],
-  "queryId": "0d45f5c5a8a417ab:85d11ec200000000",
+  "queryId": "7d4e988e98626451:c0be63a200000000",
   "user": "anurag",
   "queryText": "with t1 as (select * from functional.alltypestiny) insert into lineage_test_db.alltypesinsert (id, int_col, string_col) partition(year, month) select id, int_col, string_col, year, month from t1",
-  "endTime": 1571508641
+  "endTime": 1687533658
 }
 ---- QUERY
 with t1 as (select * from functional.alltypestiny)
@@ -4658,7 +4898,7 @@ select id, int_col, string_col, year, month from t1
 ---- LINEAGE
 {
   "hash": "b4d1a3120fe9c4e63e9a50e2bcf0ff22",
-  "timestamp": 1571508646,
+  "timestamp": 1687533663,
   "vertices": [
     {
       "vertexType": "COLUMN",
@@ -4670,8 +4910,9 @@ select id, int_col, string_col, year, month from t1
       "vertexId": "functional.alltypes.id",
       "id": 1,
       "metadata": {
-        "tableCreateTime": 1571175281,
-        "tableName": "functional.alltypes"
+        "tableCreateTime": 1687531267,
+        "tableName": "functional.alltypes",
+        "tableType": "hive"
       }
     },
     {
@@ -4679,8 +4920,9 @@ select id, int_col, string_col, year, month from t1
       "vertexId": "functional.alltypes.bigint_col",
       "id": 2,
       "metadata": {
-        "tableCreateTime": 1571175281,
-        "tableName": "functional.alltypes"
+        "tableCreateTime": 1687531267,
+        "tableName": "functional.alltypes",
+        "tableType": "hive"
       }
     },
     {
@@ -4688,8 +4930,9 @@ select id, int_col, string_col, year, month from t1
       "vertexId": "functional.alltypes.bool_col",
       "id": 3,
       "metadata": {
-        "tableCreateTime": 1571175281,
-        "tableName": "functional.alltypes"
+        "tableCreateTime": 1687531267,
+        "tableName": "functional.alltypes",
+        "tableType": "hive"
       }
     },
     {
@@ -4697,8 +4940,9 @@ select id, int_col, string_col, year, month from t1
       "vertexId": "functional.alltypes.int_col",
       "id": 4,
       "metadata": {
-        "tableCreateTime": 1571175281,
-        "tableName": "functional.alltypes"
+        "tableCreateTime": 1687531267,
+        "tableName": "functional.alltypes",
+        "tableType": "hive"
       }
     },
     {
@@ -4706,8 +4950,9 @@ select id, int_col, string_col, year, month from t1
       "vertexId": "functional.alltypes.string_col",
       "id": 5,
       "metadata": {
-        "tableCreateTime": 1571175281,
-        "tableName": "functional.alltypes"
+        "tableCreateTime": 1687531267,
+        "tableName": "functional.alltypes",
+        "tableType": "hive"
       }
     },
     {
@@ -4715,8 +4960,9 @@ select id, int_col, string_col, year, month from t1
       "vertexId": "functional.alltypes.tinyint_col",
       "id": 6,
       "metadata": {
-        "tableCreateTime": 1571175281,
-        "tableName": "functional.alltypes"
+        "tableCreateTime": 1687531267,
+        "tableName": "functional.alltypes",
+        "tableType": "hive"
       }
     }
   ],
@@ -4745,10 +4991,10 @@ select id, int_col, string_col, year, month from t1
       "edgeType": "PREDICATE"
     }
   ],
-  "queryId": "dc4337031d719a94:9eddd4c600000000",
+  "queryId": "cf494d06aa9e201a:7047aec600000000",
   "user": "anurag",
   "queryText": "select lead(a) over (partition by b order by c) from   (select lead(id) over (partition by int_col order by bigint_col) as a,    max(id) over (partition by tinyint_col order by int_col) as b,    min(int_col) over (partition by string_col order by bool_col) as c    from functional.alltypes) v",
-  "endTime": 1571508647
+  "endTime": 1687533663
 }
 ---- QUERY
 # Nested analytic functions
@@ -4762,15 +5008,16 @@ from
 ---- LINEAGE
 {
   "hash": "bc19b44ea5cab4531beb8a1dc0779df6",
-  "timestamp": 1571508652,
+  "timestamp": 1687533668,
   "vertices": [
     {
       "vertexType": "COLUMN",
       "vertexId": "id",
       "id": 0,
       "metadata": {
-        "tableCreateTime": 1571508652,
-        "tableName": "lineage_test_db.lineage_test_view1"
+        "tableCreateTime": 1687533668,
+        "tableName": "lineage_test_db.lineage_test_view1",
+        "tableType": "view"
       }
     },
     {
@@ -4778,8 +5025,9 @@ from
       "vertexId": "functional.alltypestiny.id",
       "id": 1,
       "metadata": {
-        "tableCreateTime": 1571172091,
-        "tableName": "functional.alltypestiny"
+        "tableCreateTime": 1687531270,
+        "tableName": "functional.alltypestiny",
+        "tableType": "hive"
       }
     }
   ],
@@ -4794,10 +5042,10 @@ from
       "edgeType": "PROJECTION"
     }
   ],
-  "queryId": "b649619dd79a7dab:d67c9f4900000000",
+  "queryId": "574dce023537d84c:5de5f32b00000000",
   "user": "anurag",
   "queryText": "create view lineage_test_db.lineage_test_view1 as select id from functional.alltypestiny",
-  "endTime": 1571508652
+  "endTime": 1687533668
 }
 ---- QUERY
 # Create view statement (IMPALA-4219)
@@ -4806,15 +5054,16 @@ create view lineage_test_db.lineage_test_view1 as select id from functional.allt
 ---- LINEAGE
 {
   "hash": "4e9912a672b341c75a234945ac3a63d8",
-  "timestamp": 1571508657,
+  "timestamp": 1687533673,
   "vertices": [
     {
       "vertexType": "COLUMN",
       "vertexId": "a",
       "id": 0,
       "metadata": {
-        "tableCreateTime": 1571508657,
-        "tableName": "lineage_test_db.lineage_test_view2"
+        "tableCreateTime": 1687533673,
+        "tableName": "lineage_test_db.lineage_test_view2",
+        "tableType": "view"
       }
     },
     {
@@ -4822,8 +5071,9 @@ create view lineage_test_db.lineage_test_view1 as select id from functional.allt
       "vertexId": "functional_hbase.alltypessmall.int_col",
       "id": 1,
       "metadata": {
-        "tableCreateTime": 1571172706,
-        "tableName": "functional_hbase.alltypessmall"
+        "tableCreateTime": 1687531613,
+        "tableName": "functional_hbase.alltypessmall",
+        "tableType": "hbase"
       }
     },
     {
@@ -4831,8 +5081,9 @@ create view lineage_test_db.lineage_test_view1 as select id from functional.allt
       "vertexId": "b",
       "id": 2,
       "metadata": {
-        "tableCreateTime": 1571508657,
-        "tableName": "lineage_test_db.lineage_test_view2"
+        "tableCreateTime": 1687533673,
+        "tableName": "lineage_test_db.lineage_test_view2",
+        "tableType": "view"
       }
     },
     {
@@ -4840,8 +5091,9 @@ create view lineage_test_db.lineage_test_view1 as select id from functional.allt
       "vertexId": "functional_hbase.alltypessmall.tinyint_col",
       "id": 3,
       "metadata": {
-        "tableCreateTime": 1571172706,
-        "tableName": "functional_hbase.alltypessmall"
+        "tableCreateTime": 1687531613,
+        "tableName": "functional_hbase.alltypessmall",
+        "tableType": "hbase"
       }
     }
   ],
@@ -4876,10 +5128,10 @@ create view lineage_test_db.lineage_test_view1 as select id from functional.allt
       "edgeType": "PREDICATE"
     }
   ],
-  "queryId": "f74ccc4de79bace3:ea11d35600000000",
+  "queryId": "b54cc29caca2cf8a:99ff97ae00000000",
   "user": "anurag",
   "queryText": "create view lineage_test_db.lineage_test_view2 (a, b) as select c1, x2 from (   select c1, min(c2) x2   from (     select c1, c2, c3     from (       select int_col c1, tinyint_col c2, min(float_col) c3       from functional_hbase.alltypessmall       group by 1, 2       order by 1,2       limit 1     ) x   ) x2   group by c1 ) y order by 2,1 desc limit 0",
-  "endTime": 1571508658
+  "endTime": 1687533673
 }
 ---- QUERY
 # Create view with nested inline views (IMPALA-4219)
@@ -4904,15 +5156,16 @@ limit 0
 ---- LINEAGE
 {
   "hash": "fb45884e3b8668e1239a677983ffc706",
-  "timestamp": 1571508663,
+  "timestamp": 1687533678,
   "vertices": [
     {
       "vertexType": "COLUMN",
       "vertexId": "a1",
       "id": 0,
       "metadata": {
-        "tableCreateTime": 1571508663,
-        "tableName": "lineage_test_db.lineage_test_view3"
+        "tableCreateTime": 1687533679,
+        "tableName": "lineage_test_db.lineage_test_view3",
+        "tableType": "view"
       }
     },
     {
@@ -4920,8 +5173,9 @@ limit 0
       "vertexId": "functional.alltypesagg.smallint_col",
       "id": 1,
       "metadata": {
-        "tableCreateTime": 1571172137,
-        "tableName": "functional.alltypesagg"
+        "tableCreateTime": 1687531275,
+        "tableName": "functional.alltypesagg",
+        "tableType": "hive"
       }
     },
     {
@@ -4929,8 +5183,9 @@ limit 0
       "vertexId": "a2",
       "id": 2,
       "metadata": {
-        "tableCreateTime": 1571508663,
-        "tableName": "lineage_test_db.lineage_test_view3"
+        "tableCreateTime": 1687533679,
+        "tableName": "lineage_test_db.lineage_test_view3",
+        "tableType": "view"
       }
     },
     {
@@ -4938,8 +5193,9 @@ limit 0
       "vertexId": "functional.alltypessmall.id",
       "id": 3,
       "metadata": {
-        "tableCreateTime": 1571172085,
-        "tableName": "functional.alltypessmall"
+        "tableCreateTime": 1687531269,
+        "tableName": "functional.alltypessmall",
+        "tableType": "hive"
       }
     },
     {
@@ -4947,8 +5203,9 @@ limit 0
       "vertexId": "a3",
       "id": 4,
       "metadata": {
-        "tableCreateTime": 1571508663,
-        "tableName": "lineage_test_db.lineage_test_view3"
+        "tableCreateTime": 1687533679,
+        "tableName": "lineage_test_db.lineage_test_view3",
+        "tableType": "view"
       }
     },
     {
@@ -4956,8 +5213,9 @@ limit 0
       "vertexId": "functional.alltypesagg.tinyint_col",
       "id": 5,
       "metadata": {
-        "tableCreateTime": 1571172137,
-        "tableName": "functional.alltypesagg"
+        "tableCreateTime": 1687531275,
+        "tableName": "functional.alltypesagg",
+        "tableType": "hive"
       }
     },
     {
@@ -4965,8 +5223,9 @@ limit 0
       "vertexId": "a4",
       "id": 6,
       "metadata": {
-        "tableCreateTime": 1571508663,
-        "tableName": "lineage_test_db.lineage_test_view3"
+        "tableCreateTime": 1687533679,
+        "tableName": "lineage_test_db.lineage_test_view3",
+        "tableType": "view"
       }
     },
     {
@@ -4974,8 +5233,9 @@ limit 0
       "vertexId": "a5",
       "id": 7,
       "metadata": {
-        "tableCreateTime": 1571508663,
-        "tableName": "lineage_test_db.lineage_test_view3"
+        "tableCreateTime": 1687533679,
+        "tableName": "lineage_test_db.lineage_test_view3",
+        "tableType": "view"
       }
     },
     {
@@ -4983,8 +5243,9 @@ limit 0
       "vertexId": "functional.alltypesagg.int_col",
       "id": 8,
       "metadata": {
-        "tableCreateTime": 1571172137,
-        "tableName": "functional.alltypesagg"
+        "tableCreateTime": 1687531275,
+        "tableName": "functional.alltypesagg",
+        "tableType": "hive"
       }
     },
     {
@@ -4992,8 +5253,9 @@ limit 0
       "vertexId": "a6",
       "id": 9,
       "metadata": {
-        "tableCreateTime": 1571508663,
-        "tableName": "lineage_test_db.lineage_test_view3"
+        "tableCreateTime": 1687533679,
+        "tableName": "lineage_test_db.lineage_test_view3",
+        "tableType": "view"
       }
     },
     {
@@ -5001,8 +5263,9 @@ limit 0
       "vertexId": "functional.alltypessmall.float_col",
       "id": 10,
       "metadata": {
-        "tableCreateTime": 1571172085,
-        "tableName": "functional.alltypessmall"
+        "tableCreateTime": 1687531269,
+        "tableName": "functional.alltypessmall",
+        "tableType": "hive"
       }
     },
     {
@@ -5010,8 +5273,9 @@ limit 0
       "vertexId": "a7",
       "id": 11,
       "metadata": {
-        "tableCreateTime": 1571508663,
-        "tableName": "lineage_test_db.lineage_test_view3"
+        "tableCreateTime": 1687533679,
+        "tableName": "lineage_test_db.lineage_test_view3",
+        "tableType": "view"
       }
     },
     {
@@ -5019,8 +5283,9 @@ limit 0
       "vertexId": "functional.alltypessmall.string_col",
       "id": 12,
       "metadata": {
-        "tableCreateTime": 1571172085,
-        "tableName": "functional.alltypessmall"
+        "tableCreateTime": 1687531269,
+        "tableName": "functional.alltypessmall",
+        "tableType": "hive"
       }
     },
     {
@@ -5028,8 +5293,9 @@ limit 0
       "vertexId": "functional.alltypesagg.day",
       "id": 13,
       "metadata": {
-        "tableCreateTime": 1571172137,
-        "tableName": "functional.alltypesagg"
+        "tableCreateTime": 1687531275,
+        "tableName": "functional.alltypesagg",
+        "tableType": "hive"
       }
     },
     {
@@ -5037,8 +5303,9 @@ limit 0
       "vertexId": "functional.alltypesagg.month",
       "id": 14,
       "metadata": {
-        "tableCreateTime": 1571172137,
-        "tableName": "functional.alltypesagg"
+        "tableCreateTime": 1687531275,
+        "tableName": "functional.alltypesagg",
+        "tableType": "hive"
       }
     }
   ],
@@ -5129,10 +5396,10 @@ limit 0
       "edgeType": "PREDICATE"
     }
   ],
-  "queryId": "9341dd951689a79a:dbf11b6400000000",
+  "queryId": "2a43cfbaea01dda0:c08ec40600000000",
   "user": "anurag",
   "queryText": "create view lineage_test_db.lineage_test_view3 (a1, a2, a3, a4, a5, a6, a7) as   select x.smallint_col, x.id, x.tinyint_col, c.id, x.int_col, x.float_col, c.string_col   from functional.alltypessmall c   join (      select a.smallint_col smallint_col, a.tinyint_col tinyint_col, a.day day,            a.int_col int_col, a.month month, b.float_col float_col, b.id id      from ( select * from functional.alltypesagg a where month=1 ) a      join functional.alltypessmall b on ( [...]
-  "endTime": 1571508663
+  "endTime": 1687533679
 }
 ---- QUERY
 # Create view with complex select statement (IMPALA-4219)
@@ -5154,15 +5421,16 @@ create view lineage_test_db.lineage_test_view3 (a1, a2, a3, a4, a5, a6, a7) as
 ---- LINEAGE
 {
   "hash": "51e5187935df610408fd670895640190",
-  "timestamp": 1571508668,
+  "timestamp": 1687533684,
   "vertices": [
     {
       "vertexType": "COLUMN",
       "vertexId": "_c0",
       "id": 0,
       "metadata": {
-        "tableCreateTime": 1571508668,
-        "tableName": "lineage_test_db.lineage_test_view4"
+        "tableCreateTime": 1687533684,
+        "tableName": "lineage_test_db.lineage_test_view4",
+        "tableType": "view"
       }
     },
     {
@@ -5170,8 +5438,9 @@ create view lineage_test_db.lineage_test_view3 (a1, a2, a3, a4, a5, a6, a7) as
       "vertexId": "functional.alltypes.tinyint_col",
       "id": 1,
       "metadata": {
-        "tableCreateTime": 1571175281,
-        "tableName": "functional.alltypes"
+        "tableCreateTime": 1687531267,
+        "tableName": "functional.alltypes",
+        "tableType": "hive"
       }
     },
     {
@@ -5179,8 +5448,9 @@ create view lineage_test_db.lineage_test_view3 (a1, a2, a3, a4, a5, a6, a7) as
       "vertexId": "functional.alltypes.id",
       "id": 2,
       "metadata": {
-        "tableCreateTime": 1571175281,
-        "tableName": "functional.alltypes"
+        "tableCreateTime": 1687531267,
+        "tableName": "functional.alltypes",
+        "tableType": "hive"
       }
     },
     {
@@ -5188,8 +5458,9 @@ create view lineage_test_db.lineage_test_view3 (a1, a2, a3, a4, a5, a6, a7) as
       "vertexId": "functional.alltypes.smallint_col",
       "id": 3,
       "metadata": {
-        "tableCreateTime": 1571175281,
-        "tableName": "functional.alltypes"
+        "tableCreateTime": 1687531267,
+        "tableName": "functional.alltypes",
+        "tableType": "hive"
       }
     },
     {
@@ -5197,8 +5468,9 @@ create view lineage_test_db.lineage_test_view3 (a1, a2, a3, a4, a5, a6, a7) as
       "vertexId": "_c1",
       "id": 4,
       "metadata": {
-        "tableCreateTime": 1571508668,
-        "tableName": "lineage_test_db.lineage_test_view4"
+        "tableCreateTime": 1687533684,
+        "tableName": "lineage_test_db.lineage_test_view4",
+        "tableType": "view"
       }
     },
     {
@@ -5206,8 +5478,9 @@ create view lineage_test_db.lineage_test_view3 (a1, a2, a3, a4, a5, a6, a7) as
       "vertexId": "functional.alltypessmall.string_col",
       "id": 5,
       "metadata": {
-        "tableCreateTime": 1571172085,
-        "tableName": "functional.alltypessmall"
+        "tableCreateTime": 1687531269,
+        "tableName": "functional.alltypessmall",
+        "tableType": "hive"
       }
     },
     {
@@ -5215,8 +5488,9 @@ create view lineage_test_db.lineage_test_view3 (a1, a2, a3, a4, a5, a6, a7) as
       "vertexId": "timestamp_col",
       "id": 6,
       "metadata": {
-        "tableCreateTime": 1571508668,
-        "tableName": "lineage_test_db.lineage_test_view4"
+        "tableCreateTime": 1687533684,
+        "tableName": "lineage_test_db.lineage_test_view4",
+        "tableType": "view"
       }
     },
     {
@@ -5224,8 +5498,9 @@ create view lineage_test_db.lineage_test_view3 (a1, a2, a3, a4, a5, a6, a7) as
       "vertexId": "functional.alltypessmall.timestamp_col",
       "id": 7,
       "metadata": {
-        "tableCreateTime": 1571172085,
-        "tableName": "functional.alltypessmall"
+        "tableCreateTime": 1687531269,
+        "tableName": "functional.alltypessmall",
+        "tableType": "hive"
       }
     },
     {
@@ -5233,8 +5508,9 @@ create view lineage_test_db.lineage_test_view3 (a1, a2, a3, a4, a5, a6, a7) as
       "vertexId": "functional.alltypes.int_col",
       "id": 8,
       "metadata": {
-        "tableCreateTime": 1571175281,
-        "tableName": "functional.alltypes"
+        "tableCreateTime": 1687531267,
+        "tableName": "functional.alltypes",
+        "tableType": "hive"
       }
     },
     {
@@ -5242,8 +5518,9 @@ create view lineage_test_db.lineage_test_view3 (a1, a2, a3, a4, a5, a6, a7) as
       "vertexId": "functional.alltypes.year",
       "id": 9,
       "metadata": {
-        "tableCreateTime": 1571175281,
-        "tableName": "functional.alltypes"
+        "tableCreateTime": 1687531267,
+        "tableName": "functional.alltypes",
+        "tableType": "hive"
       }
     },
     {
@@ -5251,8 +5528,9 @@ create view lineage_test_db.lineage_test_view3 (a1, a2, a3, a4, a5, a6, a7) as
       "vertexId": "functional.alltypessmall.bigint_col",
       "id": 10,
       "metadata": {
-        "tableCreateTime": 1571172085,
-        "tableName": "functional.alltypessmall"
+        "tableCreateTime": 1687531269,
+        "tableName": "functional.alltypessmall",
+        "tableType": "hive"
       }
     },
     {
@@ -5260,8 +5538,9 @@ create view lineage_test_db.lineage_test_view3 (a1, a2, a3, a4, a5, a6, a7) as
       "vertexId": "functional.alltypessmall.float_col",
       "id": 11,
       "metadata": {
-        "tableCreateTime": 1571172085,
-        "tableName": "functional.alltypessmall"
+        "tableCreateTime": 1687531269,
+        "tableName": "functional.alltypessmall",
+        "tableType": "hive"
       }
     },
     {
@@ -5269,8 +5548,9 @@ create view lineage_test_db.lineage_test_view3 (a1, a2, a3, a4, a5, a6, a7) as
       "vertexId": "functional.alltypessmall.id",
       "id": 12,
       "metadata": {
-        "tableCreateTime": 1571172085,
-        "tableName": "functional.alltypessmall"
+        "tableCreateTime": 1687531269,
+        "tableName": "functional.alltypessmall",
+        "tableType": "hive"
       }
     }
   ],
@@ -5333,10 +5613,10 @@ create view lineage_test_db.lineage_test_view3 (a1, a2, a3, a4, a5, a6, a7) as
       "edgeType": "PREDICATE"
     }
   ],
-  "queryId": "ab49fdda00d2153e:43e77eb700000000",
+  "queryId": "d448e01e4832881e:59ee2b4a00000000",
   "user": "anurag",
   "queryText": "create view lineage_test_db.lineage_test_view4 as   select * from (     select sum(a.tinyint_col) over (partition by a.smallint_col order by a.id),       count(b.string_col), b.timestamp_col     from functional.alltypes a join functional.alltypessmall b on (a.id = b.id)     where a.year = 2010 and b.float_col > 0     group by a.tinyint_col, a.smallint_col, a.id, b.string_col, b.timestamp_col, b.bigint_col     having count(a.int_col) > 10     order by b.bigint_col limit 10) t",
-  "endTime": 1571508669
+  "endTime": 1687533684
 }
 ---- QUERY
 # Create view with select statement containing an analytic function (IMPALA-4219)
@@ -5353,15 +5633,16 @@ create view lineage_test_db.lineage_test_view4 as
 ---- LINEAGE
 {
   "hash": "47f1c5e1dc11a2764f9ed27f9f2ef1ce",
-  "timestamp": 1571508674,
+  "timestamp": 1687533689,
   "vertices": [
     {
       "vertexType": "COLUMN",
       "vertexId": "id",
       "id": 0,
       "metadata": {
-        "tableCreateTime": 1571508491,
-        "tableName": "lineage_test_db.alltypes_view"
+        "tableCreateTime": 1687533513,
+        "tableName": "lineage_test_db.alltypes_view",
+        "tableType": "view"
       }
     },
     {
@@ -5369,8 +5650,9 @@ create view lineage_test_db.lineage_test_view4 as
       "vertexId": "functional.alltypestiny.id",
       "id": 1,
       "metadata": {
-        "tableCreateTime": 1571172091,
-        "tableName": "functional.alltypestiny"
+        "tableCreateTime": 1687531270,
+        "tableName": "functional.alltypestiny",
+        "tableType": "hive"
       }
     }
   ],
@@ -5385,10 +5667,10 @@ create view lineage_test_db.lineage_test_view4 as
       "edgeType": "PROJECTION"
     }
   ],
-  "queryId": "80476e74195f4624:2391cdd800000000",
+  "queryId": "b54e1dc4a678c946:eb23e54700000000",
   "user": "anurag",
   "queryText": "alter view lineage_test_db.alltypes_view as select id from functional.alltypestiny",
-  "endTime": 1571508674
+  "endTime": 1687533689
 }
 ---- QUERY
 # Alter view statement (IMPALA-4219)
@@ -5397,7 +5679,7 @@ alter view lineage_test_db.alltypes_view as select id from functional.alltypesti
 ---- LINEAGE
 {
   "hash": "b187fe7a4a6b47249f3084d3890b2c74",
-  "timestamp": 1571508679,
+  "timestamp": 1687533694,
   "vertices": [
     {
       "vertexType": "COLUMN",
@@ -5409,8 +5691,9 @@ alter view lineage_test_db.alltypes_view as select id from functional.alltypesti
       "vertexId": "functional.allcomplextypes.complex_struct_col.f1",
       "id": 1,
       "metadata": {
-        "tableCreateTime": 1571172144,
-        "tableName": "functional.allcomplextypes"
+        "tableCreateTime": 1687531278,
+        "tableName": "functional.allcomplextypes",
+        "tableType": "hive"
       }
     },
     {
@@ -5418,8 +5701,9 @@ alter view lineage_test_db.alltypes_view as select id from functional.alltypesti
       "vertexId": "functional.allcomplextypes.int_struct_col.f1",
       "id": 2,
       "metadata": {
-        "tableCreateTime": 1571172144,
-        "tableName": "functional.allcomplextypes"
+        "tableCreateTime": 1687531278,
+        "tableName": "functional.allcomplextypes",
+        "tableType": "hive"
       }
     },
     {
@@ -5427,8 +5711,9 @@ alter view lineage_test_db.alltypes_view as select id from functional.alltypesti
       "vertexId": "functional.allcomplextypes.int_struct_col.f2",
       "id": 3,
       "metadata": {
-        "tableCreateTime": 1571172144,
-        "tableName": "functional.allcomplextypes"
+        "tableCreateTime": 1687531278,
+        "tableName": "functional.allcomplextypes",
+        "tableType": "hive"
       }
     },
     {
@@ -5436,8 +5721,9 @@ alter view lineage_test_db.alltypes_view as select id from functional.alltypesti
       "vertexId": "functional.allcomplextypes.nested_struct_col.f2.f12.f21",
       "id": 4,
       "metadata": {
-        "tableCreateTime": 1571172144,
-        "tableName": "functional.allcomplextypes"
+        "tableCreateTime": 1687531278,
+        "tableName": "functional.allcomplextypes",
+        "tableType": "hive"
       }
     },
     {
@@ -5445,8 +5731,9 @@ alter view lineage_test_db.alltypes_view as select id from functional.alltypesti
       "vertexId": "functional.allcomplextypes.year",
       "id": 5,
       "metadata": {
-        "tableCreateTime": 1571172144,
-        "tableName": "functional.allcomplextypes"
+        "tableCreateTime": 1687531278,
+        "tableName": "functional.allcomplextypes",
+        "tableType": "hive"
       }
     }
   ],
@@ -5473,10 +5760,10 @@ alter view lineage_test_db.alltypes_view as select id from functional.alltypesti
       "edgeType": "PREDICATE"
     }
   ],
-  "queryId": "1e4e184fe1e92114:278af40100000000",
+  "queryId": "ee4f63ccf2181e85:2b38e8dd00000000",
   "user": "anurag",
   "queryText": "select * from (   select int_struct_col.f1 + int_struct_col.f2 x from functional.allcomplextypes   where year = 2000   order by nested_struct_col.f2.f12.f21 limit 10   union all   select sum(f1) y from     (select complex_struct_col.f1 f1 from functional.allcomplextypes      group by 1) v1) v2",
-  "endTime": 1571508679
+  "endTime": 1687533694
 }
 ---- QUERY
 # Test references to struct fields.
@@ -5492,7 +5779,7 @@ select * from (
 ---- LINEAGE
 {
   "hash": "43303560d034d3c1b8fa72962da76f62",
-  "timestamp": 1571508684,
+  "timestamp": 1687533699,
   "vertices": [
     {
       "vertexType": "COLUMN",
@@ -5504,8 +5791,9 @@ select * from (
       "vertexId": "functional.allcomplextypes.int_array_col.item",
       "id": 1,
       "metadata": {
-        "tableCreateTime": 1571172144,
-        "tableName": "functional.allcomplextypes"
+        "tableCreateTime": 1687531278,
+        "tableName": "functional.allcomplextypes",
+        "tableType": "hive"
       }
     },
     {
@@ -5518,8 +5806,9 @@ select * from (
       "vertexId": "functional.allcomplextypes.struct_map_col.key",
       "id": 3,
       "metadata": {
-        "tableCreateTime": 1571172144,
-        "tableName": "functional.allcomplextypes"
+        "tableCreateTime": 1687531278,
+        "tableName": "functional.allcomplextypes",
+        "tableType": "hive"
       }
     },
     {
@@ -5532,8 +5821,9 @@ select * from (
       "vertexId": "functional.allcomplextypes.struct_map_col.value.f1",
       "id": 5,
       "metadata": {
-        "tableCreateTime": 1571172144,
-        "tableName": "functional.allcomplextypes"
+        "tableCreateTime": 1687531278,
+        "tableName": "functional.allcomplextypes",
+        "tableType": "hive"
       }
     },
     {
@@ -5546,8 +5836,9 @@ select * from (
       "vertexId": "functional.allcomplextypes.struct_map_col.value.f2",
       "id": 7,
       "metadata": {
-        "tableCreateTime": 1571172144,
-        "tableName": "functional.allcomplextypes"
+        "tableCreateTime": 1687531278,
+        "tableName": "functional.allcomplextypes",
+        "tableType": "hive"
       }
     }
   ],
@@ -5602,10 +5893,10 @@ select * from (
       "edgeType": "PREDICATE"
     }
   ],
-  "queryId": "154d1807a8d2a566:a6f7b3b500000000",
+  "queryId": "394a9bd88d04af98:9452981700000000",
   "user": "anurag",
   "queryText": "select * from functional.allcomplextypes.int_array_col a inner join   functional.allcomplextypes.struct_map_col m on (a.item = m.f1)",
-  "endTime": 1571508685
+  "endTime": 1687533700
 }
 ---- QUERY
 # Test absolute collection table refs. Ensure that the vertex ids of sources are
@@ -5616,7 +5907,7 @@ select * from functional.allcomplextypes.int_array_col a inner join
 ---- LINEAGE
 {
   "hash": "d34d7d50b599df3912e4265f15706810",
-  "timestamp": 1571508690,
+  "timestamp": 1687533705,
   "vertices": [
     {
       "vertexType": "COLUMN",
@@ -5628,8 +5919,9 @@ select * from functional.allcomplextypes.int_array_col a inner join
       "vertexId": "functional.allcomplextypes.id",
       "id": 1,
       "metadata": {
-        "tableCreateTime": 1571172144,
-        "tableName": "functional.allcomplextypes"
+        "tableCreateTime": 1687531278,
+        "tableName": "functional.allcomplextypes",
+        "tableType": "hive"
       }
     },
     {
@@ -5642,8 +5934,9 @@ select * from functional.allcomplextypes.int_array_col a inner join
       "vertexId": "functional.allcomplextypes.year",
       "id": 3,
       "metadata": {
-        "tableCreateTime": 1571172144,
-        "tableName": "functional.allcomplextypes"
+        "tableCreateTime": 1687531278,
+        "tableName": "functional.allcomplextypes",
+        "tableType": "hive"
       }
     },
     {
@@ -5656,8 +5949,9 @@ select * from functional.allcomplextypes.int_array_col a inner join
       "vertexId": "functional.allcomplextypes.month",
       "id": 5,
       "metadata": {
-        "tableCreateTime": 1571172144,
-        "tableName": "functional.allcomplextypes"
+        "tableCreateTime": 1687531278,
+        "tableName": "functional.allcomplextypes",
+        "tableType": "hive"
       }
     },
     {
@@ -5670,8 +5964,9 @@ select * from functional.allcomplextypes.int_array_col a inner join
       "vertexId": "functional.allcomplextypes.int_array_col.item",
       "id": 7,
       "metadata": {
-        "tableCreateTime": 1571172144,
-        "tableName": "functional.allcomplextypes"
+        "tableCreateTime": 1687531278,
+        "tableName": "functional.allcomplextypes",
+        "tableType": "hive"
       }
     },
     {
@@ -5684,8 +5979,9 @@ select * from functional.allcomplextypes.int_array_col a inner join
       "vertexId": "functional.allcomplextypes.struct_map_col.key",
       "id": 9,
       "metadata": {
-        "tableCreateTime": 1571172144,
-        "tableName": "functional.allcomplextypes"
+        "tableCreateTime": 1687531278,
+        "tableName": "functional.allcomplextypes",
+        "tableType": "hive"
       }
     },
     {
@@ -5698,8 +5994,9 @@ select * from functional.allcomplextypes.int_array_col a inner join
       "vertexId": "functional.allcomplextypes.struct_map_col.value.f1",
       "id": 11,
       "metadata": {
-        "tableCreateTime": 1571172144,
-        "tableName": "functional.allcomplextypes"
+        "tableCreateTime": 1687531278,
+        "tableName": "functional.allcomplextypes",
+        "tableType": "hive"
       }
     },
     {
@@ -5712,8 +6009,9 @@ select * from functional.allcomplextypes.int_array_col a inner join
       "vertexId": "functional.allcomplextypes.struct_map_col.value.f2",
       "id": 13,
       "metadata": {
-        "tableCreateTime": 1571172144,
-        "tableName": "functional.allcomplextypes"
+        "tableCreateTime": 1687531278,
+        "tableName": "functional.allcomplextypes",
+        "tableType": "hive"
       }
     },
     {
@@ -5721,8 +6019,9 @@ select * from functional.allcomplextypes.int_array_col a inner join
       "vertexId": "functional.allcomplextypes.int_array_col",
       "id": 14,
       "metadata": {
-        "tableCreateTime": 1571172144,
-        "tableName": "functional.allcomplextypes"
+        "tableCreateTime": 1687531278,
+        "tableName": "functional.allcomplextypes",
+        "tableType": "hive"
       }
     },
     {
@@ -5730,8 +6029,9 @@ select * from functional.allcomplextypes.int_array_col a inner join
       "vertexId": "functional.allcomplextypes.struct_map_col",
       "id": 15,
       "metadata": {
-        "tableCreateTime": 1571172144,
-        "tableName": "functional.allcomplextypes"
+        "tableCreateTime": 1687531278,
+        "tableName": "functional.allcomplextypes",
+        "tableType": "hive"
       }
     }
   ],
@@ -5818,10 +6118,10 @@ select * from functional.allcomplextypes.int_array_col a inner join
       "edgeType": "PREDICATE"
     }
   ],
-  "queryId": "e24d1c92fe46e7e4:df57585500000000",
+  "queryId": "b043e925908e15a2:1a5b1afe00000000",
   "user": "anurag",
   "queryText": "select * from functional.allcomplextypes t, t.int_array_col a, t.struct_map_col m   where a.item = m.f1",
-  "endTime": 1571508690
+  "endTime": 1687533705
 }
 ---- QUERY
 # Test relative collection table refs. Ensure that the vertex ids of sources are
@@ -5832,7 +6132,7 @@ select * from functional.allcomplextypes t, t.int_array_col a, t.struct_map_col
 ---- LINEAGE
 {
   "hash": "e1684998c49aeacac122c78e7b47867f",
-  "timestamp": 1571508695,
+  "timestamp": 1687533710,
   "vertices": [
     {
       "vertexType": "COLUMN",
@@ -5844,8 +6144,9 @@ select * from functional.allcomplextypes t, t.int_array_col a, t.struct_map_col
       "vertexId": "functional.allcomplextypes.int_array_col.item",
       "id": 1,
       "metadata": {
-        "tableCreateTime": 1571172144,
-        "tableName": "functional.allcomplextypes"
+        "tableCreateTime": 1687531278,
+        "tableName": "functional.allcomplextypes",
+        "tableType": "hive"
       }
     },
     {
@@ -5853,8 +6154,9 @@ select * from functional.allcomplextypes t, t.int_array_col a, t.struct_map_col
       "vertexId": "functional.allcomplextypes.struct_map_col.value.f1",
       "id": 2,
       "metadata": {
-        "tableCreateTime": 1571172144,
-        "tableName": "functional.allcomplextypes"
+        "tableCreateTime": 1687531278,
+        "tableName": "functional.allcomplextypes",
+        "tableType": "hive"
       }
     },
     {
@@ -5867,8 +6169,9 @@ select * from functional.allcomplextypes t, t.int_array_col a, t.struct_map_col
       "vertexId": "functional.allcomplextypes.map_map_col.value.value",
       "id": 4,
       "metadata": {
-        "tableCreateTime": 1571172144,
-        "tableName": "functional.allcomplextypes"
+        "tableCreateTime": 1687531278,
+        "tableName": "functional.allcomplextypes",
+        "tableType": "hive"
       }
     },
     {
@@ -5876,8 +6179,9 @@ select * from functional.allcomplextypes t, t.int_array_col a, t.struct_map_col
       "vertexId": "functional.allcomplextypes.map_map_col.value.key",
       "id": 5,
       "metadata": {
-        "tableCreateTime": 1571172144,
-        "tableName": "functional.allcomplextypes"
+        "tableCreateTime": 1687531278,
+        "tableName": "functional.allcomplextypes",
+        "tableType": "hive"
       }
     },
     {
@@ -5890,8 +6194,9 @@ select * from functional.allcomplextypes t, t.int_array_col a, t.struct_map_col
       "vertexId": "functional.allcomplextypes.int_map_col.value",
       "id": 7,
       "metadata": {
-        "tableCreateTime": 1571172144,
-        "tableName": "functional.allcomplextypes"
+        "tableCreateTime": 1687531278,
+        "tableName": "functional.allcomplextypes",
+        "tableType": "hive"
       }
     },
     {
@@ -5904,8 +6209,9 @@ select * from functional.allcomplextypes t, t.int_array_col a, t.struct_map_col
       "vertexId": "functional.allcomplextypes.complex_nested_struct_col.f2.item.f12.value.f21",
       "id": 9,
       "metadata": {
-        "tableCreateTime": 1571172144,
-        "tableName": "functional.allcomplextypes"
+        "tableCreateTime": 1687531278,
+        "tableName": "functional.allcomplextypes",
+        "tableType": "hive"
       }
     },
     {
@@ -5913,8 +6219,9 @@ select * from functional.allcomplextypes t, t.int_array_col a, t.struct_map_col
       "vertexId": "functional.allcomplextypes.complex_nested_struct_col.f2.item.f12.key",
       "id": 10,
       "metadata": {
-        "tableCreateTime": 1571172144,
-        "tableName": "functional.allcomplextypes"
+        "tableCreateTime": 1687531278,
+        "tableName": "functional.allcomplextypes",
+        "tableType": "hive"
       }
     },
     {
@@ -5922,8 +6229,9 @@ select * from functional.allcomplextypes t, t.int_array_col a, t.struct_map_col
       "vertexId": "functional.allcomplextypes.struct_map_col.key",
       "id": 11,
       "metadata": {
-        "tableCreateTime": 1571172144,
-        "tableName": "functional.allcomplextypes"
+        "tableCreateTime": 1687531278,
+        "tableName": "functional.allcomplextypes",
+        "tableType": "hive"
       }
     }
   ],
@@ -5990,10 +6298,10 @@ select * from functional.allcomplextypes t, t.int_array_col a, t.struct_map_col
       "edgeType": "PREDICATE"
     }
   ],
-  "queryId": "f343f3dbb3ca2a4b:7636d52400000000",
+  "queryId": "04414cb7de8797d4:4caad29500000000",
   "user": "anurag",
   "queryText": "select a + b as ab, c, d, e from functional.allcomplextypes t,   (select sum(item) a from t.int_array_col    where item < 10) v1,   (select count(f1) b from t.struct_map_col    group by key) v2,   (select avg(value) over(partition by key) c from t.map_map_col.value) v3,   (select item d from t.int_array_col    union all    select value from t.int_map_col) v4,   (select f21 e from t.complex_nested_struct_col.f2.f12 order by key limit 10) v5",
-  "endTime": 1571508695
+  "endTime": 1687533710
 }
 ---- QUERY
 # Test relative collection table refs in inline views.
@@ -6011,15 +6319,16 @@ select a + b as ab, c, d, e from functional.allcomplextypes t,
 ---- LINEAGE
 {
   "hash": "5b43652748f22f00515ddf6ed699aec0",
-  "timestamp": 1571508700,
+  "timestamp": 1687533715,
   "vertices": [
     {
       "vertexType": "COLUMN",
       "vertexId": "id",
       "id": 0,
       "metadata": {
-        "tableCreateTime": 1571508700,
-        "tableName": "lineage_test_db.lineage_test_view5"
+        "tableCreateTime": 1687533715,
+        "tableName": "lineage_test_db.lineage_test_view5",
+        "tableType": "view"
       }
     },
     {
@@ -6027,8 +6336,9 @@ select a + b as ab, c, d, e from functional.allcomplextypes t,
       "vertexId": "functional.alltypes.id",
       "id": 1,
       "metadata": {
-        "tableCreateTime": 1571175281,
-        "tableName": "functional.alltypes"
+        "tableCreateTime": 1687531267,
+        "tableName": "functional.alltypes",
+        "tableType": "hive"
       }
     }
   ],
@@ -6052,14 +6362,431 @@ select a + b as ab, c, d, e from functional.allcomplextypes t,
       "edgeType": "PREDICATE"
     }
   ],
-  "queryId": "91461ace6cbd0cf4:5618eea700000000",
+  "queryId": "764a4986b0d631c2:a52f087b00000000",
   "user": "anurag",
   "queryText": "create view lineage_test_db.lineage_test_view5 as select id from functional.alltypes_view v where not exists (select 1 from functional.alltypes a where v.id = a.id)",
-  "endTime": 1571508700
+  "endTime": 1687533715
 }
 ---- QUERY
 # IMPALA-4206: Test creating a view whose definition has a subquery and a view reference.
 create view lineage_test_db.lineage_test_view5 as
 select id from functional.alltypes_view v
 where not exists (select 1 from functional.alltypes a where v.id = a.id)
-====
\ No newline at end of file
+====
+---- LINEAGE
+{
+  "hash": "f69515f6a2cfcd95c1914fc7da09834a",
+  "timestamp": 1687615426,
+  "vertices": [
+    {
+      "vertexType": "COLUMN",
+      "vertexId": "id",
+      "id": 0,
+      "metadata": {
+        "tableCreateTime": 1687615426,
+        "tableName": "lineage_test_db.ice_ctas",
+        "tableType": "iceberg"
+      }
+    },
+    {
+      "vertexType": "COLUMN",
+      "vertexId": "functional_parquet.alltypes.id",
+      "id": 1,
+      "metadata": {
+        "tableCreateTime": 1687531213,
+        "tableName": "functional_parquet.alltypes",
+        "tableType": "hive"
+      }
+    },
+    {
+      "vertexType": "COLUMN",
+      "vertexId": "string_col",
+      "id": 2,
+      "metadata": {
+        "tableCreateTime": 1687615426,
+        "tableName": "lineage_test_db.ice_ctas",
+        "tableType": "iceberg"
+      }
+    },
+    {
+      "vertexType": "COLUMN",
+      "vertexId": "functional_parquet.alltypes.string_col",
+      "id": 3,
+      "metadata": {
+        "tableCreateTime": 1687531213,
+        "tableName": "functional_parquet.alltypes",
+        "tableType": "hive"
+      }
+    },
+    {
+      "vertexType": "COLUMN",
+      "vertexId": "timestamp_col",
+      "id": 4,
+      "metadata": {
+        "tableCreateTime": 1687615426,
+        "tableName": "lineage_test_db.ice_ctas",
+        "tableType": "iceberg"
+      }
+    },
+    {
+      "vertexType": "COLUMN",
+      "vertexId": "functional_parquet.alltypes.timestamp_col",
+      "id": 5,
+      "metadata": {
+        "tableCreateTime": 1687531213,
+        "tableName": "functional_parquet.alltypes",
+        "tableType": "hive"
+      }
+    }
+  ],
+  "edges": [
+    {
+      "sources": [
+        1
+      ],
+      "targets": [
+        0
+      ],
+      "edgeType": "PROJECTION"
+    },
+    {
+      "sources": [
+        3
+      ],
+      "targets": [
+        2
+      ],
+      "edgeType": "PROJECTION"
+    },
+    {
+      "sources": [
+        5
+      ],
+      "targets": [
+        4
+      ],
+      "edgeType": "PROJECTION"
+    }
+  ],
+  "queryId": "db47d0dcf9aa4267:6cfbbef700000000",
+  "user": "boroknagyz",
+  "queryText": "create table lineage_test_db.ice_ctas partitioned by spec (truncate(1, string_col)) stored by iceberg as select id, string_col, timestamp_col from functional_parquet.alltypes",
+  "endTime": 1687615427
+}
+---- QUERY
+# Execute lineage tests for Iceberg tables.
+create table lineage_test_db.ice_ctas partitioned by spec (truncate(1, string_col)) stored by iceberg as
+select id, string_col, timestamp_col from functional_parquet.alltypes
+====
+---- LINEAGE
+{
+  "hash": "c37e1110bfc63dfe2e3e4c132a9def2f",
+  "timestamp": 1687615432,
+  "vertices": [
+    {
+      "vertexType": "COLUMN",
+      "vertexId": "id",
+      "id": 0,
+      "metadata": {
+        "tableCreateTime": 1687615420,
+        "tableName": "lineage_test_db.iceberg_partitioned",
+        "tableType": "iceberg"
+      }
+    },
+    {
+      "vertexType": "COLUMN",
+      "vertexId": "functional_parquet.iceberg_partitioned.id",
+      "id": 1,
+      "metadata": {
+        "tableCreateTime": 1687531274,
+        "tableName": "functional_parquet.iceberg_partitioned",
+        "tableType": "iceberg"
+      }
+    },
+    {
+      "vertexType": "COLUMN",
+      "vertexId": "user",
+      "id": 2,
+      "metadata": {
+        "tableCreateTime": 1687615420,
+        "tableName": "lineage_test_db.iceberg_partitioned",
+        "tableType": "iceberg"
+      }
+    },
+    {
+      "vertexType": "COLUMN",
+      "vertexId": "functional_parquet.iceberg_partitioned.user",
+      "id": 3,
+      "metadata": {
+        "tableCreateTime": 1687531274,
+        "tableName": "functional_parquet.iceberg_partitioned",
+        "tableType": "iceberg"
+      }
+    },
+    {
+      "vertexType": "COLUMN",
+      "vertexId": "action",
+      "id": 4,
+      "metadata": {
+        "tableCreateTime": 1687615420,
+        "tableName": "lineage_test_db.iceberg_partitioned",
+        "tableType": "iceberg"
+      }
+    },
+    {
+      "vertexType": "COLUMN",
+      "vertexId": "functional_parquet.iceberg_partitioned.action",
+      "id": 5,
+      "metadata": {
+        "tableCreateTime": 1687531274,
+        "tableName": "functional_parquet.iceberg_partitioned",
+        "tableType": "iceberg"
+      }
+    },
+    {
+      "vertexType": "COLUMN",
+      "vertexId": "event_time",
+      "id": 6,
+      "metadata": {
+        "tableCreateTime": 1687615420,
+        "tableName": "lineage_test_db.iceberg_partitioned",
+        "tableType": "iceberg"
+      }
+    },
+    {
+      "vertexType": "COLUMN",
+      "vertexId": "functional_parquet.iceberg_partitioned.event_time",
+      "id": 7,
+      "metadata": {
+        "tableCreateTime": 1687531274,
+        "tableName": "functional_parquet.iceberg_partitioned",
+        "tableType": "iceberg"
+      }
+    }
+  ],
+  "edges": [
+    {
+      "sources": [
+        1
+      ],
+      "targets": [
+        0
+      ],
+      "edgeType": "PROJECTION"
+    },
+    {
+      "sources": [
+        3
+      ],
+      "targets": [
+        2
+      ],
+      "edgeType": "PROJECTION"
+    },
+    {
+      "sources": [
+        5
+      ],
+      "targets": [
+        4
+      ],
+      "edgeType": "PROJECTION"
+    },
+    {
+      "sources": [
+        7
+      ],
+      "targets": [
+        6
+      ],
+      "edgeType": "PROJECTION"
+    }
+  ],
+  "queryId": "1942b41abdcfba11:1d8e573d00000000",
+  "user": "boroknagyz",
+  "queryText": "insert into lineage_test_db.iceberg_partitioned select * from functional_parquet.iceberg_partitioned",
+  "endTime": 1687615432
+}
+---- QUERY
+insert into lineage_test_db.iceberg_partitioned
+select * from functional_parquet.iceberg_partitioned
+====
+---- LINEAGE
+{
+  "hash": "c37e1110bfc63dfe2e3e4c132a9def2f",
+  "timestamp": 1687615437,
+  "vertices": [
+    {
+      "vertexType": "COLUMN",
+      "vertexId": "id",
+      "id": 0,
+      "metadata": {
+        "tableCreateTime": 1687615420,
+        "tableName": "lineage_test_db.iceberg_partitioned",
+        "tableType": "iceberg"
+      }
+    },
+    {
+      "vertexType": "COLUMN",
+      "vertexId": "functional_parquet.iceberg_partitioned.id",
+      "id": 1,
+      "metadata": {
+        "tableCreateTime": 1687531274,
+        "tableName": "functional_parquet.iceberg_partitioned",
+        "tableType": "iceberg"
+      }
+    },
+    {
+      "vertexType": "COLUMN",
+      "vertexId": "user",
+      "id": 2,
+      "metadata": {
+        "tableCreateTime": 1687615420,
+        "tableName": "lineage_test_db.iceberg_partitioned",
+        "tableType": "iceberg"
+      }
+    },
+    {
+      "vertexType": "COLUMN",
+      "vertexId": "functional_parquet.iceberg_partitioned.user",
+      "id": 3,
+      "metadata": {
+        "tableCreateTime": 1687531274,
+        "tableName": "functional_parquet.iceberg_partitioned",
+        "tableType": "iceberg"
+      }
+    },
+    {
+      "vertexType": "COLUMN",
+      "vertexId": "action",
+      "id": 4,
+      "metadata": {
+        "tableCreateTime": 1687615420,
+        "tableName": "lineage_test_db.iceberg_partitioned",
+        "tableType": "iceberg"
... 126 lines suppressed ...