You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@drill.apache.org by ar...@apache.org on 2019/08/27 10:18:25 UTC
[drill] 04/06: DRILL-7339: Iceberg commit upgrade and Metastore
tests categorization
This is an automated email from the ASF dual-hosted git repository.
arina pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/drill.git
commit 305f040ae5c4a3851bf139e9ed4b4efb70b09dd8
Author: Arina Ielchiieva <ar...@gmail.com>
AuthorDate: Wed Aug 14 19:17:46 2019 +0300
DRILL-7339: Iceberg commit upgrade and Metastore tests categorization
1. Upgraded Iceberg commit to fix issue with deletes in transaction
2. Categorize Metastore tests
closes #1842
---
.../org/apache/drill/categories/MetastoreTest.java | 24 ++++++++++++++++++++++
metastore/iceberg-metastore/pom.xml | 2 +-
.../drill/metastore/iceberg/IcebergBaseTest.java | 3 +++
.../components/tables/TestBasicTablesRequests.java | 3 +++
.../tables/TestBasicTablesTransformer.java | 3 +++
.../components/tables/TestMetastoreTableInfo.java | 3 +++
.../tables/TestTableMetadataUnitConversion.java | 3 +++
.../metastore/metadata/MetadataSerDeTest.java | 3 +++
8 files changed, 43 insertions(+), 1 deletion(-)
diff --git a/common/src/test/java/org/apache/drill/categories/MetastoreTest.java b/common/src/test/java/org/apache/drill/categories/MetastoreTest.java
new file mode 100644
index 0000000..9da1e03
--- /dev/null
+++ b/common/src/test/java/org/apache/drill/categories/MetastoreTest.java
@@ -0,0 +1,24 @@
+/*
+ * 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.categories;
+
+/**
+ * This is a category used to mark unit tests that test the Drill Metastore and its components.
+ */
+public interface MetastoreTest {
+}
diff --git a/metastore/iceberg-metastore/pom.xml b/metastore/iceberg-metastore/pom.xml
index d935750..41d4690 100644
--- a/metastore/iceberg-metastore/pom.xml
+++ b/metastore/iceberg-metastore/pom.xml
@@ -33,7 +33,7 @@
<name>metastore/Drill Iceberg Metastore</name>
<properties>
- <iceberg.version>08e0873</iceberg.version>
+ <iceberg.version>1b0b9c2</iceberg.version>
<caffeine.version>2.7.0</caffeine.version>
</properties>
diff --git a/metastore/iceberg-metastore/src/test/java/org/apache/drill/metastore/iceberg/IcebergBaseTest.java b/metastore/iceberg-metastore/src/test/java/org/apache/drill/metastore/iceberg/IcebergBaseTest.java
index 0250ce9..5ef7b80 100644
--- a/metastore/iceberg-metastore/src/test/java/org/apache/drill/metastore/iceberg/IcebergBaseTest.java
+++ b/metastore/iceberg-metastore/src/test/java/org/apache/drill/metastore/iceberg/IcebergBaseTest.java
@@ -19,6 +19,7 @@ package org.apache.drill.metastore.iceberg;
import com.typesafe.config.Config;
import com.typesafe.config.ConfigValueFactory;
+import org.apache.drill.categories.MetastoreTest;
import org.apache.drill.common.config.DrillConfig;
import org.apache.drill.common.util.GuavaPatcher;
import org.apache.drill.metastore.iceberg.config.IcebergConfigConstants;
@@ -28,11 +29,13 @@ import org.apache.hadoop.fs.Path;
import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Rule;
+import org.junit.experimental.categories.Category;
import org.junit.rules.ExpectedException;
import org.junit.rules.TemporaryFolder;
import java.io.File;
+@Category(MetastoreTest.class)
public abstract class IcebergBaseTest {
@ClassRule
diff --git a/metastore/metastore-api/src/test/java/org/apache/drill/metastore/components/tables/TestBasicTablesRequests.java b/metastore/metastore-api/src/test/java/org/apache/drill/metastore/components/tables/TestBasicTablesRequests.java
index 4a8baf7..9c6c45c 100644
--- a/metastore/metastore-api/src/test/java/org/apache/drill/metastore/components/tables/TestBasicTablesRequests.java
+++ b/metastore/metastore-api/src/test/java/org/apache/drill/metastore/components/tables/TestBasicTablesRequests.java
@@ -17,8 +17,10 @@
*/
package org.apache.drill.metastore.components.tables;
+import org.apache.drill.categories.MetastoreTest;
import org.apache.drill.metastore.expressions.FilterExpression;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import java.util.Arrays;
import java.util.Collections;
@@ -28,6 +30,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
+@Category(MetastoreTest.class)
public class TestBasicTablesRequests {
@Test
diff --git a/metastore/metastore-api/src/test/java/org/apache/drill/metastore/components/tables/TestBasicTablesTransformer.java b/metastore/metastore-api/src/test/java/org/apache/drill/metastore/components/tables/TestBasicTablesTransformer.java
index 84002ff..1bd9f6a 100644
--- a/metastore/metastore-api/src/test/java/org/apache/drill/metastore/components/tables/TestBasicTablesTransformer.java
+++ b/metastore/metastore-api/src/test/java/org/apache/drill/metastore/components/tables/TestBasicTablesTransformer.java
@@ -17,6 +17,7 @@
*/
package org.apache.drill.metastore.components.tables;
+import org.apache.drill.categories.MetastoreTest;
import org.apache.drill.metastore.metadata.BaseTableMetadata;
import org.apache.drill.metastore.metadata.FileMetadata;
import org.apache.drill.metastore.metadata.MetadataInfo;
@@ -25,6 +26,7 @@ import org.apache.drill.metastore.metadata.PartitionMetadata;
import org.apache.drill.metastore.metadata.RowGroupMetadata;
import org.apache.drill.metastore.metadata.SegmentMetadata;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import java.util.Arrays;
import java.util.Collections;
@@ -33,6 +35,7 @@ import java.util.List;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
+@Category(MetastoreTest.class)
public class TestBasicTablesTransformer {
@Test
diff --git a/metastore/metastore-api/src/test/java/org/apache/drill/metastore/components/tables/TestMetastoreTableInfo.java b/metastore/metastore-api/src/test/java/org/apache/drill/metastore/components/tables/TestMetastoreTableInfo.java
index bc80c66..90ce610 100644
--- a/metastore/metastore-api/src/test/java/org/apache/drill/metastore/components/tables/TestMetastoreTableInfo.java
+++ b/metastore/metastore-api/src/test/java/org/apache/drill/metastore/components/tables/TestMetastoreTableInfo.java
@@ -17,12 +17,15 @@
*/
package org.apache.drill.metastore.components.tables;
+import org.apache.drill.categories.MetastoreTest;
import org.apache.drill.metastore.metadata.TableInfo;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
+@Category(MetastoreTest.class)
public class TestMetastoreTableInfo {
@Test
diff --git a/metastore/metastore-api/src/test/java/org/apache/drill/metastore/components/tables/TestTableMetadataUnitConversion.java b/metastore/metastore-api/src/test/java/org/apache/drill/metastore/components/tables/TestTableMetadataUnitConversion.java
index 359c0cb..7f49947 100644
--- a/metastore/metastore-api/src/test/java/org/apache/drill/metastore/components/tables/TestTableMetadataUnitConversion.java
+++ b/metastore/metastore-api/src/test/java/org/apache/drill/metastore/components/tables/TestTableMetadataUnitConversion.java
@@ -17,6 +17,7 @@
*/
package org.apache.drill.metastore.components.tables;
+import org.apache.drill.categories.MetastoreTest;
import org.apache.drill.common.expression.SchemaPath;
import org.apache.drill.common.types.TypeProtos;
import org.apache.drill.exec.record.metadata.SchemaBuilder;
@@ -36,6 +37,7 @@ import org.apache.drill.metastore.statistics.StatisticsHolder;
import org.apache.hadoop.fs.Path;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import java.util.Arrays;
import java.util.Collection;
@@ -50,6 +52,7 @@ import java.util.stream.Collectors;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
+@Category(MetastoreTest.class)
public class TestTableMetadataUnitConversion {
private static Data data;
diff --git a/metastore/metastore-api/src/test/java/org/apache/drill/metastore/metadata/MetadataSerDeTest.java b/metastore/metastore-api/src/test/java/org/apache/drill/metastore/metadata/MetadataSerDeTest.java
index eb44741..6a2d36d 100644
--- a/metastore/metastore-api/src/test/java/org/apache/drill/metastore/metadata/MetadataSerDeTest.java
+++ b/metastore/metastore-api/src/test/java/org/apache/drill/metastore/metadata/MetadataSerDeTest.java
@@ -17,6 +17,7 @@
*/
package org.apache.drill.metastore.metadata;
+import org.apache.drill.categories.MetastoreTest;
import org.apache.drill.common.types.TypeProtos;
import org.apache.drill.metastore.statistics.BaseStatisticsKind;
import org.apache.drill.metastore.statistics.ColumnStatistics;
@@ -24,6 +25,7 @@ import org.apache.drill.metastore.statistics.ColumnStatisticsKind;
import org.apache.drill.metastore.statistics.StatisticsHolder;
import org.apache.drill.metastore.statistics.TableStatisticsKind;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import java.math.BigDecimal;
import java.util.Arrays;
@@ -33,6 +35,7 @@ import java.util.Objects;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
+@Category(MetastoreTest.class)
public class MetadataSerDeTest {
@Test