[phoenix] branch 4.x-HBase-1.5 updated: PHOENIX-5351 Speedup OrphanViewToolIT.

[larsh]

This is an automated email from the ASF dual-hosted git repository.

larsh pushed a commit to branch 4.x-HBase-1.5
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/4.x-HBase-1.5 by this push:
     new 39586be  PHOENIX-5351 Speedup OrphanViewToolIT.
39586be is described below

commit 39586be4b57db316248ce9363d523969aabb3247
Author: Lars Hofhansl <la...@apache.org>
AuthorDate: Sun Jun 23 22:06:09 2019 -0700

    PHOENIX-5351 Speedup OrphanViewToolIT.
---
 .../org/apache/phoenix/end2end/OrphanViewToolIT.java   | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/OrphanViewToolIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/OrphanViewToolIT.java
index 7a05d27..32ec586 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/OrphanViewToolIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/OrphanViewToolIT.java
@@ -57,7 +57,6 @@ public class OrphanViewToolIT extends ParallelStatsDisabledIT 
{
     private static final Logger LOGGER = 
LoggerFactory.getLogger(OrphanViewToolIT.class);
 
     private final boolean isMultiTenant;
-    private final boolean columnEncoded;
 
     private static final long fanout = 2;
     private static final long childCount = fanout;
@@ -118,16 +117,13 @@ public class OrphanViewToolIT extends 
ParallelStatsDisabledIT {
 
     private static final String deleteSchemaRows = "DELETE FROM %s WHERE " + 
TABLE_SCHEM + " %s";
 
-    public OrphanViewToolIT(boolean isMultiTenant, boolean columnEncoded) {
+    public OrphanViewToolIT(boolean isMultiTenant) {
         this.isMultiTenant = isMultiTenant;
-        this.columnEncoded = columnEncoded;
     }
 
-    @Parameters(name="OrphanViewToolIT_multiTenant={0}, columnEncoded={1}") // 
name is used by failsafe as file name in reports
-    public static Collection<Boolean[]> data() {
-        return Arrays.asList(new Boolean[][] {
-                { false, false }, { false, true },
-                { true, false }, { true, true } });
+    @Parameters(name="OrphanViewToolIT_multiTenant={0}") // name is used by 
failsafe as file name in reports
+    public static Collection<Boolean> data() {
+        return Arrays.asList(false, true);
     }
 
     @AfterClass
@@ -146,11 +142,6 @@ public class OrphanViewToolIT extends 
ParallelStatsDisabledIT {
 
     private String generateDDL(String options, String format) {
         StringBuilder optionsBuilder = new StringBuilder(options);
-        if (!columnEncoded) {
-            if (optionsBuilder.length()!=0)
-                optionsBuilder.append(",");
-            optionsBuilder.append("COLUMN_ENCODED_BYTES=0");
-        }
         if (isMultiTenant) {
             if (optionsBuilder.length()!=0)
                 optionsBuilder.append(",");
@@ -216,6 +207,7 @@ public class OrphanViewToolIT extends 
ParallelStatsDisabledIT {
         if (count != lineCount)
             LOGGER.debug(count + " != " + lineCount);
         assertTrue(count == lineCount);
+        reader.close();
     }
 
     private void verifyCountQuery(Connection connection, String query, String 
schemaName, long count)