diff --git a/hudi-spark/src/main/scala/org/apache/hudi/DefaultSource.scala b/hudi-spark/src/main/scala/org/apache/hudi/DefaultSource.scala
index fbdd4ea9cfb1b..5444da11d1fc0 100644
--- a/hudi-spark/src/main/scala/org/apache/hudi/DefaultSource.scala
+++ b/hudi-spark/src/main/scala/org/apache/hudi/DefaultSource.scala
@@ -23,9 +23,10 @@ import org.apache.hudi.hadoop.HoodieROTablePathFilter
 import org.apache.log4j.LogManager
 import org.apache.spark.sql.execution.datasources.DataSource
 import org.apache.spark.sql.execution.datasources.SaveIntoDataSourceCommand
-import org.apache.spark.sql.execution.streaming.Sink
+import org.apache.spark.sql.execution.streaming.{Sink, Source}
 import org.apache.spark.sql.sources._
 import org.apache.spark.sql.streaming.OutputMode
+import org.apache.spark.sql.structured.datasource.HoodieSparkStructuredSource
 import org.apache.spark.sql.types.StructType
 import org.apache.spark.sql.{DataFrame, SQLContext, SaveMode}
 
@@ -38,6 +39,7 @@ class DefaultSource extends RelationProvider
   with CreatableRelationProvider
   with DataSourceRegister
   with StreamSinkProvider
+  with StreamSourceProvider
   with Serializable {
 
   private val log = LogManager.getLogger(classOf[DefaultSource])
@@ -123,4 +125,24 @@ class DefaultSource extends RelationProvider
   }
 
   override def shortName(): String = "hudi"
+
+  override def sourceSchema(sqlContext: SQLContext,
+                            schemaOpt: Option[StructType],
+                            providerName: String,
+                            parameters: Map[String, String]): (String, StructType) = {
+    (shortName(), schemaOpt.get)
+  }
+
+  override def createSource(sqlContext: SQLContext,
+                            metadataPath: String,
+                            schemaOpt: Option[StructType],
+                            providerName: String,
+                            parameters: Map[String, String]): Source = {
+    new HoodieSparkStructuredSource(sqlContext,
+      metadataPath,
+      schemaOpt,
+      providerName,
+      parameters)
+  }
 }
+
diff --git a/hudi-spark/src/main/scala/org/apache/spark/sql/structured/datasource/HoodieSparkStructuredSource.scala b/hudi-spark/src/main/scala/org/apache/spark/sql/structured/datasource/HoodieSparkStructuredSource.scala
new file mode 100644
index 0000000000000..e84bbb6733026
--- /dev/null
+++ b/hudi-spark/src/main/scala/org/apache/spark/sql/structured/datasource/HoodieSparkStructuredSource.scala
@@ -0,0 +1,77 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+package org.apache.spark.sql.structured.datasource
+
+import org.apache.hudi.common.table.HoodieTableMetaClient
+import org.apache.hudi.common.table.timeline.HoodieInstant
+import org.apache.hudi.common.util
+import org.apache.spark.sql.catalyst.InternalRow
+import org.apache.spark.sql.execution.streaming.{Offset, Source}
+import org.apache.spark.sql.types.StructType
+import org.apache.spark.sql.{DataFrame, SQLContext}
+import org.json4s.jackson.Serialization
+import org.json4s.{Formats, NoTypeHints}
+
+class HoodieSparkStructuredSource (sqlContext: SQLContext,
+                                   metadataPath: String,
+                                   schemaOpt: Option[StructType],
+                                   providerName: String,
+                                   parameters: Map[String, String]) extends Source {
+
+  override def schema: StructType = {
+    schemaOpt.get
+  }
+
+  override def getOffset: scala.Option[HoodieStructuredSourceOffset] = {
+    val path = parameters.get("path")
+    val hoodieTableMetaClient = new HoodieTableMetaClient(sqlContext.sparkContext.hadoopConfiguration, path.get)
+    val hoodieInstant: util.Option[HoodieInstant] = hoodieTableMetaClient.getCommitTimeline.lastInstant()
+    var time: String = ""
+    if (hoodieInstant.isPresent) {
+      time = hoodieInstant.get().getTimestamp
+    }
+    val tableName = hoodieTableMetaClient.getTableConfig.getTableName
+    val offsets = HoodieStructuredSourceOffset(Map[String, String] (tableName -> time))
+    Option(offsets)
+  }
+
+  override def getBatch(start: Option[Offset], end: Offset): DataFrame = {
+    //TODO
+    /**
+     * The next step
+     * we will get hoodie data
+     */
+    sqlContext.internalCreateDataFrame(
+      sqlContext.sparkContext.emptyRDD[InternalRow].setName("empty"), schema,  true)
+  }
+
+  override def stop(): Unit = {
+  }
+
+  def offset2Map(offset: Offset): Map[String, String] = {
+    implicit val formats: AnyRef with Formats = Serialization.formats(NoTypeHints)
+    Serialization.read[Map[String, String]](offset.json())
+  }
+}
+case class HoodieStructuredSourceOffset(offset: Map[String, String]) extends Offset {
+  implicit val formats: AnyRef with Formats = Serialization.formats(NoTypeHints)
+
+  override def json(): String = Serialization.write(offset)
+}
+
+