markusthoemmes commented on a change in pull request #3421: Add ElasticSearch Log Store URL: https://github.com/apache/incubator-openwhisk/pull/3421#discussion_r177686463
########## File path: common/scala/src/main/scala/whisk/core/containerpool/logging/ElasticSearchRestClient.scala ########## @@ -0,0 +1,212 @@ +/* + * 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 whisk.core.containerpool.logging + +import scala.concurrent.Future +import scala.util.Either +import scala.util.Failure +import scala.util.Left +import scala.util.Right +import scala.util.Success +import scala.util.Try + +import akka.actor.ActorSystem +import akka.http.scaladsl.model._ +import akka.http.scaladsl.model.headers.Accept +import akka.stream.scaladsl.Flow + +import scala.concurrent.Promise +import scala.util.Try + +import spray.json._ + +import whisk.http.PoolingRestClient + +trait EsQueryMethod +trait EsOrder +trait EsRange +trait EsAgg +trait EsMatch + +// Schema of ES query operators +case object EsOrderAsc extends EsOrder { override def toString = "asc" } +case object EsOrderDesc extends EsOrder { override def toString = "desc" } +case object EsRangeGte extends EsRange { override def toString = "gte" } +case object EsRangeGt extends EsRange { override def toString = "gt" } +case object EsRangeLte extends EsRange { override def toString = "lte" } +case object EsRangeLt extends EsRange { override def toString = "lt" } +case object EsAggMax extends EsAgg { override def toString = "max" } +case object EsAggMin extends EsAgg { override def toString = "min" } +case object EsMatchPhrase extends EsMatch { override def toString = "phrase" } +case object EsMatchPhrasePrefix extends EsMatch { override def toString = "phrase_prefix" } + +// Schema of ES queries +case class EsQueryAggs(aggField: String, agg: EsAgg, field: String) +case class EsQueryRange(key: String, range: EsRange, value: String) +case class EsQueryBoolMatch(key: String, value: String) +case class EsQueryOrder(field: String, kind: EsOrder) +case class EsQuerySize(size: Integer) +case class EsQueryAll() extends EsQueryMethod +case class EsQueryMust(matches: Vector[EsQueryBoolMatch], range: Option[EsQueryRange] = None) extends EsQueryMethod +case class EsQueryMatch(field: String, value: String, matchType: Option[EsMatch] = None) extends EsQueryMethod +case class EsQueryTerm(key: String, value: String) extends EsQueryMethod +case class EsQueryString(queryString: String) extends EsQueryMethod +case class EsQuery(query: EsQueryMethod, + sort: Option[EsQueryOrder] = None, + size: Option[EsQuerySize] = None, + aggs: Option[EsQueryAggs] = None) + +// Schema of ES query results +case class EsSearchHit(source: JsObject) +case class EsSearchHits(hits: Vector[EsSearchHit]) +case class EsSearchResult(hits: EsSearchHits) + +object ElasticSearchJsonProtocol extends DefaultJsonProtocol { + + implicit object EsQueryMatchJsonFormat extends RootJsonFormat[EsQueryMatch] { + def read(query: JsValue) = ??? + def write(query: EsQueryMatch) = { + query.matchType match { + case Some(matchType) => + JsObject( + "match" -> JsObject( + query.field -> JsObject("query" -> query.value.toJson, "type" -> matchType.toString.toJson))) + case None => JsObject("match" -> JsObject(query.field -> JsObject("query" -> query.value.toJson))) + } + } + } + + implicit object EsQueryTermJsonFormat extends RootJsonFormat[EsQueryTerm] { + def read(query: JsValue) = ??? + def write(query: EsQueryTerm) = JsObject("term" -> JsObject(query.key -> query.value.toJson)) + } + + implicit object EsQueryStringJsonFormat extends RootJsonFormat[EsQueryString] { + def read(query: JsValue) = ??? + def write(query: EsQueryString) = + JsObject("query_string" -> JsObject("query" -> query.queryString.toJson)) + } + + implicit object EsQueryRangeJsonFormat extends RootJsonFormat[EsQueryRange] { + def read(query: JsValue) = ??? + def write(query: EsQueryRange) = + JsObject("range" -> JsObject(query.key -> JsObject(query.range.toString -> query.value.toJson))) + } + + implicit object EsQueryBoolMatchJsonFormat extends RootJsonFormat[EsQueryBoolMatch] { + def read(query: JsValue) = ??? + def write(query: EsQueryBoolMatch) = JsObject("match" -> JsObject(query.key -> query.value.toJson)) + } + + implicit object EsQueryMustJsonFormat extends RootJsonFormat[EsQueryMust] { + def read(query: JsValue) = ??? + def write(query: EsQueryMust) = query.range match { + case Some(range) => + JsObject("bool" -> JsObject("must" -> query.matches.toJson, "filter" -> range.toJson)) + case None => + JsObject("bool" -> JsObject("must" -> query.matches.toJson)) + } Review comment: Can be simplified to: ```scala def write(query: EsQueryMust) = { val bool = Map("must" -> query.matches.toJson) ++ query.range.map(r => "filter" -> r.toJson) JsObject("bool" -> bool) } ``` It basically only adds the filter to the `Map` if range is `Some` (because then `++` will actually have an element to add). Adding an `Option` to a collection via `++` is generally a great trick to build collections with...well... optional values. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
