Address CR comments

h2oai · Dec 13, 2023 · 920e3b0 · 920e3b0
1 parent 2bf2f85
commit 920e3b0
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 16 deletions.
diff --git a/sql/datasource_available.sql b/sql/datasource_available.sql
@@ -1,3 +1,3 @@
 SELECT count(*) cnt
 FROM INFORMATION_SCHEMA.TABLES
-WHERE TABLE_SCHEMA = 'druid' AND TABLE_NAME=?
+WHERE TABLE_SCHEMA = 'druid' AND TABLE_NAME=?
diff --git a/sql/datasource_records.sql b/sql/datasource_records.sql
@@ -1,2 +1,2 @@
 SELECT count(*) cnt
-FROM "${{ datasource }}" ds
+FROM "${{ datasource }}" ds
diff --git a/task_types.go b/task_types.go
@@ -43,10 +43,6 @@ func defaultTaskIngestionSpec() *TaskIngestionSpec {
 		Spec: &IngestionSpecData{
 			DataSchema: &DataSchema{
 				DataSource: "some_datasource",
-				TimeStampSpec: &TimestampSpec{
-					Column: "ts",
-					Format: "auto",
-				},
 				GranularitySpec: &GranularitySpec{
 					Type:               "uniform",
 					SegmentGranularity: "DAY",
@@ -63,16 +59,9 @@ func defaultTaskIngestionSpec() *TaskIngestionSpec {
 			IOConfig: &IOConfig{
 				Type: "index_parallel",
 				InputSource: &InputSource{
-					Type: "sql",
-					Database: &Database{
-						Type: "postgresql",
-						ConnectorConfig: &ConnectorConfig{
-							ConnectURI: "jdbc:postgresql://host:port/schema",
-							User:       "user",
-							Password:   "password",
-						},
-					},
-					SQLs: []string{},
+					Type:     "sql",
+					Database: &Database{},
+					SQLs:     []string{},
 				},
 				InputFormat: &InputFormat{
 					Type: "json",
@@ -98,6 +87,18 @@ func SetTaskType(stype string) TaskIngestionSpecOptions {
 	}
 }
 
+// SetTaskTimestampColumn sets the type of the task IOConfig.
+func SetTaskTimestampColumn(column string) TaskIngestionSpecOptions {
+	return func(spec *TaskIngestionSpec) {
+		if column != "" {
+			spec.Spec.DataSchema.TimeStampSpec = &TimestampSpec{
+				Column: column,
+				Format: "auto",
+			}
+		}
+	}
+}
+
 // SetTaskDataSource sets the destination datasource of the task IOConfig.
 func SetTaskDataSource(datasource string) TaskIngestionSpecOptions {
 	return func(spec *TaskIngestionSpec) {

diff --git a/tasks_test.go b/tasks_test.go
@@ -46,6 +46,7 @@ func TriggerIngestionTask[T any](d *Client, dataSourceName string, entries []T)
 
 	var spec = NewTaskIngestionSpec(
 		SetTaskType("index_parallel"),
+		SetTaskTimestampColumn("ts"),
 		SetTaskDataSource(dataSourceName),
 		SetTaskTuningConfig("index_parallel", 25000, 5000000),
 		SetTaskIOConfigType("index_parallel"),