This repository has been archived by the owner on Nov 20, 2019. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 51
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[CROSSDATA-832] Make Elasticsearch Crossdata connector comply with th…
…e flattening algorithm requirements (#810) * Adapted type tests to core template * Improved template flexibility * Added array type to Elasticsearch connector.
- Loading branch information
Showing
6 changed files
with
275 additions
and
191 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
221 changes: 221 additions & 0 deletions
221
...earch/src/test/scala/com/stratio/crossdata/connector/elasticsearch/ElasticDataTypes.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,221 @@ | ||
| /* | ||
| * Copyright (C) 2015 Stratio (http://stratio.com) | ||
| * | ||
| * Licensed 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 com.stratio.crossdata.connector.elasticsearch | ||
|
|
||
| import java.util.{GregorianCalendar, UUID} | ||
|
|
||
| import com.sksamuel.elastic4s.ElasticDsl._ | ||
| import com.sksamuel.elastic4s.mappings.FieldType._ | ||
| import com.sksamuel.elastic4s.mappings.{MappingDefinition, TypedFieldDefinition} | ||
| import com.stratio.common.utils.components.logger.impl.SparkLoggerComponent | ||
| import com.typesafe.config.ConfigFactory | ||
| import org.apache.spark.sql.Row | ||
| import org.apache.spark.sql.catalyst.expressions.GenericRowWithSchema | ||
| import org.apache.spark.sql.crossdata.test.SharedXDContextTypesTest | ||
| import org.apache.spark.sql.crossdata.test.SharedXDContextTypesTest.SparkSQLColDef | ||
| import org.joda.time.DateTime | ||
|
|
||
| trait ElasticDataTypes extends ElasticWithSharedContext | ||
| with SharedXDContextTypesTest | ||
| with ElasticSearchDataTypesDefaultConstants | ||
| with SparkLoggerComponent { | ||
|
|
||
| override val dataTypesSparkOptions = Map( | ||
| "resource" -> s"$Index/$Type", | ||
| "es.nodes" -> s"$ElasticHost", | ||
| "es.port" -> s"$ElasticRestPort", | ||
| "es.nativePort" -> s"$ElasticNativePort", | ||
| "es.cluster" -> s"$ElasticClusterName", | ||
| "es.nodes.wan.only" -> "true", | ||
| "es.read.field.as.array.include" -> Seq( | ||
| "arrayint" | ||
| ).mkString(",") | ||
| ) | ||
|
|
||
| protected case class ESColumnData(elasticType: Option[TypedFieldDefinition], data: () => Any) | ||
| protected object ESColumnData { | ||
| def apply(data: () => Any): ESColumnData = ESColumnData(None, data) | ||
| def apply(elasticType: TypedFieldDefinition, data: () => Any): ESColumnData = ESColumnData(Some(elasticType), data) | ||
| } | ||
|
|
||
|
|
||
| override val arrayFlattenTestColumn: String = "arraystruct" | ||
|
|
||
| protected val dataTest: Seq[(SparkSQLColDef, ESColumnData)] = Seq( | ||
| (SparkSQLColDef("id", "INT", _ shouldBe a[java.lang.Integer]), ESColumnData("id" typed IntegerType, () => 1)), | ||
| (SparkSQLColDef("age", "LONG", _ shouldBe a[java.lang.Long]), ESColumnData("age" typed LongType, () => 1)), | ||
| ( | ||
| SparkSQLColDef("description", "STRING", _ shouldBe a[java.lang.String]), | ||
| ESColumnData("description" typed StringType, () => "1") | ||
| ), | ||
| ( | ||
| SparkSQLColDef("name", "STRING", _ shouldBe a[java.lang.String]), | ||
| ESColumnData( "name" typed StringType index NotAnalyzed, () => "1") | ||
| ), | ||
| ( | ||
| SparkSQLColDef("enrolled", "BOOLEAN", _ shouldBe a[java.lang.Boolean]), | ||
| ESColumnData("enrolled" typed BooleanType, () => false) | ||
| ), | ||
| ( | ||
| SparkSQLColDef("birthday", "DATE", _ shouldBe a [java.sql.Date]), | ||
| ESColumnData("birthday" typed DateType, () => DateTime.parse(1980 + "-01-01T10:00:00-00:00").toDate) | ||
| ), | ||
| ( | ||
| SparkSQLColDef("salary", "DOUBLE", _ shouldBe a[java.lang.Double]), | ||
| ESColumnData("salary" typed DoubleType, () => 0.15) | ||
| ), | ||
| ( | ||
| SparkSQLColDef("timecol", "TIMESTAMP", _ shouldBe a[java.sql.Timestamp]), | ||
| ESColumnData( | ||
| "timecol" typed DateType, | ||
| () => new java.sql.Timestamp(new GregorianCalendar(1970, 0, 1, 0, 0, 0).getTimeInMillis) | ||
| ) | ||
| ), | ||
| ( | ||
| SparkSQLColDef("float", "FLOAT", _ shouldBe a[java.lang.Float]), | ||
| ESColumnData("float" typed FloatType, () => 0.15) | ||
| ), | ||
| ( | ||
| SparkSQLColDef("binary", "BINARY", x => x.isInstanceOf[Array[Byte]] shouldBe true), | ||
| ESColumnData("binary" typed BinaryType, () => "YWE=".getBytes) | ||
| ), | ||
| ( | ||
| SparkSQLColDef("tinyint", "TINYINT", _ shouldBe a[java.lang.Byte]), | ||
| ESColumnData("tinyint" typed ByteType, () => Byte.MinValue) | ||
| ), | ||
| ( | ||
| SparkSQLColDef("smallint", "SMALLINT", _ shouldBe a[java.lang.Short]), | ||
| ESColumnData("smallint" typed ShortType, () => Short.MaxValue) | ||
| ), | ||
| ( | ||
| SparkSQLColDef("subdocument", "STRUCT<field1: INT>", _ shouldBe a [Row]), | ||
| ESColumnData("subdocument" inner ("field1" typed IntegerType), () => Map( "field1" -> 15)) | ||
| ), | ||
| ( | ||
| SparkSQLColDef( | ||
| "structofstruct", | ||
| "STRUCT<field1: INT, struct1: STRUCT<structField1: INT>>", | ||
| { res => | ||
| res shouldBe a[GenericRowWithSchema] | ||
| res.asInstanceOf[GenericRowWithSchema].get(1) shouldBe a[GenericRowWithSchema] | ||
| } | ||
| ), | ||
| ESColumnData( | ||
| "structofstruct" inner ("field1" typed IntegerType, "struct1" inner("structField1" typed IntegerType)), | ||
| () => Map("field1" -> 15, "struct1" -> Map("structField1" -> 42)) | ||
| ) | ||
| ), | ||
| ( | ||
| SparkSQLColDef("arrayint", "ARRAY<INT>", _ shouldBe a[Seq[_]]), | ||
| ESColumnData(() => Seq(1,2,3,4)) | ||
| ), | ||
| ( | ||
| SparkSQLColDef("arraystruct", "ARRAY<STRUCT<field1: LONG, field2: LONG>>", _ shouldBe a[Seq[_]]), | ||
| ESColumnData( | ||
| "arraystruct" nested( | ||
| "field1" typed LongType, | ||
| "field2" typed LongType | ||
| ), | ||
| () => | ||
| Array( | ||
| Map( | ||
| "field1" -> 11, | ||
| "field2" -> 12 | ||
| ), | ||
| Map( | ||
| "field1" -> 21, | ||
| "field2" -> 22 | ||
| ), | ||
| Map( | ||
| "field1" -> 31, | ||
| "field2" -> 32 | ||
| ) | ||
| ) | ||
| ) | ||
| )/*, | ||
| ( | ||
| SparkSQLColDef( | ||
| "arraystructarraystruct", | ||
| "ARRAY<STRUCT<stringfield: STRING, arrayfield: ARRAY<STRUCT<field1: INT, field2: INT>>>>", | ||
| { res => | ||
| res shouldBe a[Seq[_]] | ||
| res.asInstanceOf[Seq[_]].head shouldBe a[Row] | ||
| res.asInstanceOf[Seq[_]].head.asInstanceOf[Row].get(1) shouldBe a[Seq[_]] | ||
| res.asInstanceOf[Seq[_]].head.asInstanceOf[Row].get(1).asInstanceOf[Seq[_]].head shouldBe a[Row] | ||
| } | ||
| ), | ||
| ESColumnData( | ||
| "arraystructarraystruct" nested ( | ||
| "stringfield" typed StringType, | ||
| "arrayfield" nested ( | ||
| "field1" typed IntegerType, | ||
| "field2" typed IntegerType | ||
| ) | ||
| ), | ||
| () => Array( | ||
| Map( | ||
| "stringfield" -> "hello", | ||
| "arrayfield" -> Array( | ||
| Map( | ||
| "field1" -> 10, | ||
| "field2" -> 20 | ||
| ) | ||
| ) | ||
| ) | ||
| ) | ||
| ) | ||
| )*/ | ||
| ) | ||
|
|
||
|
|
||
| override protected def typesSet: Seq[SparkSQLColDef] = dataTest.map(_._1) | ||
|
|
||
|
|
||
| abstract override def saveTestData: Unit = { | ||
| require(saveTypesData > 0, emptyTypesSetError) | ||
| } | ||
|
|
||
| override def saveTypesData: Int = { | ||
| client.get.execute { | ||
| val fieldsData = dataTest map { | ||
| case (SparkSQLColDef(fieldName, _, _), ESColumnData(_, data)) => (fieldName, data()) | ||
| } | ||
| index into Index / Type fields (fieldsData: _*) | ||
| }.await | ||
| client.get.execute { | ||
| flush index Index | ||
| }.await | ||
| 1 | ||
| } | ||
|
|
||
| override def typeMapping(): MappingDefinition = | ||
| Type fields ( | ||
| dataTest collect { | ||
| case (_, ESColumnData(Some(mapping), _)) => mapping | ||
| }: _* | ||
| ) | ||
|
|
||
| override val emptyTypesSetError: String = "Couldn't insert Elasticsearch types test data" | ||
|
|
||
| } | ||
|
|
||
|
|
||
| trait ElasticSearchDataTypesDefaultConstants extends ElasticSearchDefaultConstants{ | ||
| private lazy val config = ConfigFactory.load() | ||
| override val Index = s"idxname${UUID.randomUUID.toString.replaceAll("-", "")}" | ||
| override val Type = s"typename${UUID.randomUUID.toString.replaceAll("-", "")}" | ||
|
|
||
| } |
Oops, something went wrong.