Add tpch handles to serialization hierarchy

trinodb · Nov 28, 2012 · 43e992f · 43e992f
1 parent e069c30
commit 43e992f
Show file tree

Hide file tree

Showing 15 changed files with 6 additions and 2 deletions.
diff --git a/presto-main/src/main/java/com/facebook/presto/metadata/ColumnHandle.java b/presto-main/src/main/java/com/facebook/presto/metadata/ColumnHandle.java
@@ -1,5 +1,6 @@
 package com.facebook.presto.metadata;
 
+import com.facebook.presto.tpch.TpchColumnHandle;
 import org.codehaus.jackson.annotate.JsonSubTypes;
 import org.codehaus.jackson.annotate.JsonTypeInfo;
 
@@ -9,7 +10,8 @@
         property = "columnHandleType")
 @JsonSubTypes({
         @JsonSubTypes.Type(value = NativeColumnHandle.class, name = "native"),
-        @JsonSubTypes.Type(value = ImportColumnHandle.class, name = "import")})
+        @JsonSubTypes.Type(value = ImportColumnHandle.class, name = "import"),
+        @JsonSubTypes.Type(value = TpchColumnHandle.class, name = "tpch")})
 public interface ColumnHandle
 {
     DataSourceType getDataSourceType();

diff --git a/presto-main/src/main/java/com/facebook/presto/metadata/TableHandle.java b/presto-main/src/main/java/com/facebook/presto/metadata/TableHandle.java
@@ -1,5 +1,6 @@
 package com.facebook.presto.metadata;
 
+import com.facebook.presto.tpch.TpchTableHandle;
 import org.codehaus.jackson.annotate.JsonSubTypes;
 import org.codehaus.jackson.annotate.JsonTypeInfo;
 
@@ -9,7 +10,8 @@
         property = "type")
 @JsonSubTypes({
         @JsonSubTypes.Type(value = NativeTableHandle.class, name = "native"),
-        @JsonSubTypes.Type(value = ImportTableHandle.class, name = "import")})
+        @JsonSubTypes.Type(value = ImportTableHandle.class, name = "import"),
+        @JsonSubTypes.Type(value = TpchTableHandle.class, name = "tpch")})
 public interface TableHandle
 {
     DataSourceType getDataSourceType();

diff --git a/...book/presto/metadata/TestingMetadata.java → ...book/presto/metadata/TestingMetadata.java b/...book/presto/metadata/TestingMetadata.java → ...book/presto/metadata/TestingMetadata.java
diff --git a/.../presto/tpch/CachingTpchDataProvider.java → .../presto/tpch/CachingTpchDataProvider.java b/.../presto/tpch/CachingTpchDataProvider.java → .../presto/tpch/CachingTpchDataProvider.java
diff --git a/...esto/tpch/GeneratingTpchDataProvider.java → ...esto/tpch/GeneratingTpchDataProvider.java b/...esto/tpch/GeneratingTpchDataProvider.java → ...esto/tpch/GeneratingTpchDataProvider.java
diff --git a/...ch/MetricRecordingTpchBlocksProvider.java → ...ch/MetricRecordingTpchBlocksProvider.java b/...ch/MetricRecordingTpchBlocksProvider.java → ...ch/MetricRecordingTpchBlocksProvider.java
diff --git a/.../presto/tpch/StatsTpchBlocksProvider.java → .../presto/tpch/StatsTpchBlocksProvider.java b/.../presto/tpch/StatsTpchBlocksProvider.java → .../presto/tpch/StatsTpchBlocksProvider.java
diff --git a/...ebook/presto/tpch/TpchBlocksProvider.java → ...ebook/presto/tpch/TpchBlocksProvider.java b/...ebook/presto/tpch/TpchBlocksProvider.java → ...ebook/presto/tpch/TpchBlocksProvider.java
diff --git a/...acebook/presto/tpch/TpchColumnHandle.java → ...acebook/presto/tpch/TpchColumnHandle.java b/...acebook/presto/tpch/TpchColumnHandle.java → ...acebook/presto/tpch/TpchColumnHandle.java
diff --git a/...acebook/presto/tpch/TpchDataProvider.java → ...acebook/presto/tpch/TpchDataProvider.java b/...acebook/presto/tpch/TpchDataProvider.java → ...acebook/presto/tpch/TpchDataProvider.java
diff --git a/...k/presto/tpch/TpchDataStreamProvider.java → ...k/presto/tpch/TpchDataStreamProvider.java b/...k/presto/tpch/TpchDataStreamProvider.java → ...k/presto/tpch/TpchDataStreamProvider.java
diff --git a/...tpch/TpchLegacyStorageManagerAdapter.java → ...tpch/TpchLegacyStorageManagerAdapter.java b/...tpch/TpchLegacyStorageManagerAdapter.java → ...tpch/TpchLegacyStorageManagerAdapter.java
diff --git a/.../com/facebook/presto/tpch/TpchSchema.java → .../com/facebook/presto/tpch/TpchSchema.java b/.../com/facebook/presto/tpch/TpchSchema.java → .../com/facebook/presto/tpch/TpchSchema.java
diff --git a/...a/com/facebook/presto/tpch/TpchSplit.java → ...a/com/facebook/presto/tpch/TpchSplit.java b/...a/com/facebook/presto/tpch/TpchSplit.java → ...a/com/facebook/presto/tpch/TpchSplit.java
diff --git a/...facebook/presto/tpch/TpchTableHandle.java → ...facebook/presto/tpch/TpchTableHandle.java b/...facebook/presto/tpch/TpchTableHandle.java → ...facebook/presto/tpch/TpchTableHandle.java