add memstore for in memory schema read at schema handler (#360)

uber · Mar 6, 2020 · 42e7331 · 42e7331
1 parent 95d3565
commit 42e7331
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 16 deletions.
diff --git a/api/schema_handler.go b/api/schema_handler.go
@@ -16,6 +16,7 @@ package api
 
 import (
 	"encoding/json"
+	memCom "github.com/uber/aresdb/memstore/common"
 	"github.com/uber/aresdb/metastore"
 	"net/http"
 
@@ -30,12 +31,14 @@ import (
 type SchemaHandler struct {
 	// all write requests will go to metaStore.
 	metaStore metaCom.MetaStore
+	schemaReader memCom.TableSchemaReader
 }
 
 // NewSchemaHandler will create a new SchemaHandler with memStore and metaStore.
-func NewSchemaHandler(metaStore metaCom.MetaStore) *SchemaHandler {
+func NewSchemaHandler(metaStore metaCom.MetaStore, schemaReader memCom.TableSchemaReader) *SchemaHandler {
 	return &SchemaHandler{
 		metaStore: metaStore,
+		schemaReader: schemaReader,
 	}
 }
 
@@ -72,12 +75,8 @@ func (handler *SchemaHandler) ListTables(w *utils.ResponseWriter, r *http.Reques
 
 	response := apiCom.NewStringArrayResponse()
 
-	tables, err := handler.metaStore.ListTables()
-	if err != nil {
-		w.WriteError(err)
-		return
-	}
-	for _, tableName := range tables {
+	allTables := handler.schemaReader.GetSchemas()
+	for tableName := range allTables {
 		response.Body = append(response.Body, tableName)
 	}
 
@@ -106,14 +105,12 @@ func (handler *SchemaHandler) GetTable(w *utils.ResponseWriter, r *http.Request)
 		return
 	}
 
-	table, err := handler.metaStore.GetTable(getTableRequest.TableName)
+	schema, err := handler.schemaReader.GetSchema(getTableRequest.TableName)
 	if err != nil {
-		if err.Error() == metaCom.ErrTableDoesNotExist.Error() {
-			w.WriteErrorWithCode(http.StatusNotFound, err)
-			return
-		}
+		w.WriteErrorWithCode(http.StatusNotFound, ErrTableDoesNotExist)
+		return
 	}
-	getTableResponse.JSONBuffer, err = json.Marshal(table)
+	getTableResponse.JSONBuffer, err = json.Marshal(schema.Schema)
 	w.WriteJSONBytes(getTableResponse.JSONBuffer, err)
 }
 

diff --git a/api/schema_handler_test.go b/api/schema_handler_test.go
@@ -70,7 +70,7 @@ var _ = ginkgo.Describe("SchemaHandler", func() {
 
 	ginkgo.BeforeEach(func() {
 		testMemStore = CreateMemStore(&testTableSchema, 0, nil, nil)
-		schemaHandler = NewSchemaHandler(testMetaStore)
+		schemaHandler = NewSchemaHandler(testMetaStore, testMemStore)
 		testRouter := mux.NewRouter()
 		schemaHandler.Register(testRouter.PathPrefix("/schema").Subrouter())
 		testServer = httptest.NewUnstartedServer(WithPanicHandling(testRouter))

diff --git a/cmd/aresd/cmd/cmd.go b/cmd/aresd/cmd/cmd.go
@@ -203,7 +203,7 @@ func (aresd *AresD) start(cfg common.AresServerConfig, logger common.Logger, que
 	}
 
 	// create schema handler
-	schemaHandler := api.NewSchemaHandler(metaStore)
+	schemaHandler := api.NewSchemaHandler(metaStore, memStore)
 
 	// create enum handler
 	enumHandler := api.NewEnumHandler(memStore, metaStore)

diff --git a/datanode/datanode.go b/datanode/datanode.go
@@ -721,7 +721,7 @@ func newDatanodeMetrics(scope tally.Scope) datanodeMetrics {
 func (d *dataNode) newHandlers() datanodeHandlers {
 	healthCheckHandler := api.NewHealthCheckHandler()
 	return datanodeHandlers{
-		schemaHandler:      api.NewSchemaHandler(d.metaStore),
+		schemaHandler:      api.NewSchemaHandler(d.metaStore, d.memStore),
 		enumHandler:        api.NewEnumHandler(d.memStore, d.metaStore),
 		queryHandler:       api.NewQueryHandler(d.memStore, d, d.opts.ServerConfig().Query, d.opts.ServerConfig().HTTP.MaxQueryConnections),
 		dataHandler:        api.NewDataHandler(d.memStore, d.opts.ServerConfig().HTTP.MaxIngestionConnections),