You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@drill.apache.org by GitBox <gi...@apache.org> on 2022/03/02 18:15:15 UTC
[GitHub] [drill] vvysotskyi commented on a change in pull request #2477: DRILL-8151: Add support for more ElasticSearch and Cassandra data types
vvysotskyi commented on a change in pull request #2477:
URL: https://github.com/apache/drill/pull/2477#discussion_r817959124
##########
File path: contrib/storage-elasticsearch/src/test/java/org/apache/drill/exec/store/elasticsearch/TestElasticsearchSuit.java
##########
@@ -0,0 +1,79 @@
+/*
+ * 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.drill.exec.store.elasticsearch;
+
+import org.apache.drill.categories.SlowTest;
+import org.apache.drill.test.BaseTest;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.testcontainers.elasticsearch.ElasticsearchContainer;
+import org.testcontainers.utility.DockerImageName;
+
+import java.time.Duration;
+import java.util.concurrent.atomic.AtomicInteger;
+
+@Category(SlowTest.class)
+@RunWith(Suite.class)
+@Suite.SuiteClasses({ElasticComplexTypesTest.class, ElasticInfoSchemaTest.class, ElasticSearchPlanTest.class, ElasticSearchQueryTest.class})
+public class TestElasticsearchSuit extends BaseTest {
Review comment:
Done.
##########
File path: contrib/storage-elasticsearch/pom.xml
##########
@@ -88,36 +97,17 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<forkCount combine.self="override">1</forkCount>
+ <includes>
+ <include>**/TestElasticsearchSuit.class</include>
Review comment:
Thanks, done.
##########
File path: contrib/storage-cassandra/src/test/java/org/apache/drill/exec/store/cassandra/CassandraQueryTest.java
##########
@@ -327,9 +349,18 @@ public void testWithProvidedSchema() throws Exception {
.ordered()
.baselineColumns("employee_id", "full_name", "first_name", "last_name", "position_id",
"position_title", "store_id", "department_id", "birth_date", "hire_date", "salary",
- "supervisor_id", "education_level", "marital_status", "gender", "management_role")
+ "supervisor_id", "education_level", "marital_status", "gender", "management_role",
+ "ascii_field", "blob_field", "boolean_field", "date_field", "decimal_field", "double_field",
+ "duration_field", "inet_field", "time_field", "timestamp_field", "timeuuid_field",
+ "uuid_field", "varchar_field", "varint_field")
.baselineValues(1L, "Sheri Nowmer", "Sheri", "Nowmer", 1, "President", 0, 1, LocalDate.parse("1961-08-26"),
- "1994-12-01 00:00:00.0", new BigDecimal("80000.00"), 0, "Graduate Degree", "S", "F", "Senior Management")
+ "1994-12-01 00:00:00.0", new BigDecimal("80000.00"), 0, "Graduate Degree", "S", "F", "Senior Management",
+ "abc", "0000000000000003", true, 15008L, BigDecimal.valueOf(123), 321.123,
+ new Period(0, 0, 0, 3, 0, 0, 0, 320688000),
+ InetAddress.getByName("8.8.8.8").getAddress(), 14700000000000L, 1296705900000L,
+ ByteBuffer.wrap(new byte[16]).order(ByteOrder.BIG_ENDIAN).putLong(5788618031596507621L).putLong(-5528732594182759265L).array(),
Review comment:
Thanks, done
##########
File path: contrib/storage-elasticsearch/pom.xml
##########
@@ -88,36 +97,17 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<forkCount combine.self="override">1</forkCount>
+ <includes>
+ <include>**/TestElasticsearchSuit.class</include>
+ </includes>
+ <excludes>
+ <exclude>**/ElasticComplexTypesTest.java</exclude>
Review comment:
It is excluded because now tests will be running as a test suite.
##########
File path: contrib/storage-cassandra/src/main/java/org/apache/drill/exec/store/cassandra/CassandraColumnConverterFactory.java
##########
@@ -0,0 +1,144 @@
+/*
+ * 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.drill.exec.store.cassandra;
+
+import com.datastax.driver.core.Duration;
+import org.apache.drill.common.types.TypeProtos;
+import org.apache.drill.exec.record.ColumnConverter;
+import org.apache.drill.exec.record.ColumnConverterFactory;
+import org.apache.drill.exec.record.metadata.ColumnMetadata;
+import org.apache.drill.exec.record.metadata.TupleMetadata;
+import org.apache.drill.exec.vector.accessor.TupleWriter;
+import org.apache.drill.exec.vector.accessor.ValueWriter;
+import org.joda.time.Period;
+import org.joda.time.format.PeriodFormatter;
+import org.joda.time.format.PeriodFormatterBuilder;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.net.Inet4Address;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.util.Map;
+import java.util.UUID;
+import java.util.stream.Collectors;
+import java.util.stream.StreamSupport;
+
+public class CassandraColumnConverterFactory extends ColumnConverterFactory {
+
+ private static final PeriodFormatter FORMATTER = new PeriodFormatterBuilder()
+ .appendYears()
+ .appendSuffix("Y")
+ .appendMonths()
+ .appendSuffix("M")
+ .appendWeeks()
+ .appendSuffix("W")
+ .appendDays()
+ .appendSuffix("D")
+ .appendHours()
+ .appendSuffix("H")
+ .appendMinutes()
+ .appendSuffix("M")
+ .appendSecondsWithOptionalMillis()
+ .appendSuffix("S")
+ .toFormatter();
+
+ public CassandraColumnConverterFactory(TupleMetadata providedSchema) {
+ super(providedSchema);
+ }
+
+ @Override
+ public ColumnConverter.ScalarColumnConverter buildScalar(ColumnMetadata readerSchema, ValueWriter writer) {
+ switch (readerSchema.type()) {
+ case INTERVAL:
+ return new ColumnConverter.ScalarColumnConverter(value -> {
+ Duration duration = (Duration) value;
+ writer.setPeriod(Period.parse(duration.toString(), FORMATTER));
+ });
+ case BIGINT:
+ return new ColumnConverter.ScalarColumnConverter(value -> {
+ long longValue;
+ if (value instanceof BigInteger) {
+ longValue = ((BigInteger) value).longValue();
+ } else {
+ longValue = (Long) value;
+ }
+ writer.setLong(longValue);
+ });
+ case VARCHAR:
+ return new ColumnConverter.ScalarColumnConverter(value -> writer.setString(value.toString()));
+ case VARDECIMAL:
+ return new ColumnConverter.ScalarColumnConverter(value -> writer.setDecimal((BigDecimal) value));
+ case VARBINARY:
+ return new ColumnConverter.ScalarColumnConverter(value -> {
+ byte[] bytes;
+ if (value instanceof Inet4Address) {
+ bytes = ((Inet4Address) value).getAddress();
Review comment:
It is a different object, so it cannot be cast to `byte[]`.
##########
File path: contrib/storage-elasticsearch/src/test/java/org/apache/drill/exec/store/elasticsearch/ElasticSearchQueryTest.java
##########
@@ -95,6 +96,14 @@ private static void prepareData() throws IOException {
builder.field("marital_status", "S");
builder.field("gender", "F");
builder.field("management_role", "Senior Management");
+ builder.field("binary_filed", "Senior Management".getBytes());
Review comment:
Thanks, done.
##########
File path: exec/java-exec/src/main/java/org/apache/drill/exec/store/enumerable/ColumnConverterFactoryProvider.java
##########
@@ -0,0 +1,28 @@
+/*
+ * 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.drill.exec.store.enumerable;
+
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import org.apache.drill.exec.record.ColumnConverterFactory;
+import org.apache.drill.exec.record.metadata.TupleMetadata;
+
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME)
+public interface ColumnConverterFactoryProvider {
Review comment:
Factory requires schema which can be available only at execution time, so we can't create a specific instance of converter factory in group scan. Therefore I'm using one more interface which will be also serialized/deserialized using its name.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscribe@drill.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org