[31/50] [abbrv] phoenix git commit: PHOENIX-3120 AsyncIndexRebuilderTask fails for transactional tables
PHOENIX-3120 AsyncIndexRebuilderTask fails for transactional tables Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/c37f73f6 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/c37f73f6 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/c37f73f6 Branch: refs/heads/encodecolumns Commit: c37f73f659ea9192c0e806bb783f43fd22560f67 Parents: 3fc4066 Author: Thomas D'SilvaAuthored: Thu Jul 28 18:21:45 2016 -0700 Committer: Thomas D'Silva Committed: Fri Jul 29 13:52:14 2016 -0700 -- .../apache/phoenix/end2end/index/IndexIT.java | 108 --- .../coprocessor/MetaDataRegionObserver.java | 34 +++--- .../apache/phoenix/schema/MetaDataClient.java | 11 +- 3 files changed, 120 insertions(+), 33 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/c37f73f6/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexIT.java index ff26208..35a0aad 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexIT.java @@ -42,21 +42,26 @@ import java.util.Properties; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.phoenix.compile.ColumnResolver; import org.apache.phoenix.compile.FromCompiler; +import org.apache.phoenix.coprocessor.generated.PTableProtos.PTableType; import org.apache.phoenix.end2end.BaseHBaseManagedTimeIT; +import org.apache.phoenix.end2end.BaseHBaseManagedTimeTableReuseIT; import org.apache.phoenix.end2end.Shadower; import org.apache.phoenix.exception.SQLExceptionCode; import org.apache.phoenix.jdbc.PhoenixConnection; +import org.apache.phoenix.jdbc.PhoenixDatabaseMetaData; import org.apache.phoenix.jdbc.PhoenixStatement; import org.apache.phoenix.parse.NamedTableNode; import org.apache.phoenix.parse.TableName; import org.apache.phoenix.query.BaseTest; import org.apache.phoenix.query.QueryServices; +import org.apache.phoenix.schema.PIndexState; import org.apache.phoenix.schema.PTable; import org.apache.phoenix.util.DateUtil; import org.apache.phoenix.util.PropertiesUtil; import org.apache.phoenix.util.QueryUtil; import org.apache.phoenix.util.ReadOnlyProps; import org.apache.phoenix.util.SchemaUtil; +import org.apache.phoenix.util.StringUtil; import org.apache.phoenix.util.TestUtil; import org.junit.BeforeClass; import org.junit.Test; @@ -67,16 +72,13 @@ import org.junit.runners.Parameterized.Parameters; import com.google.common.collect.Maps; @RunWith(Parameterized.class) -public class IndexIT extends BaseHBaseManagedTimeIT { - +public class IndexIT extends BaseHBaseManagedTimeTableReuseIT { +private static final long MAX_WAIT_FOR_ASYNC_INDEX_BUILD = 3; + private final boolean localIndex; private final boolean transactional; private final boolean mutable; private final String tableDDLOptions; - private final String tableName; -private final String indexName; -private final String fullTableName; -private final String fullIndexName; public IndexIT(boolean localIndex, boolean mutable, boolean transactional) { this.localIndex = localIndex; @@ -91,10 +93,6 @@ public class IndexIT extends BaseHBaseManagedTimeIT { optionBuilder.append(" TRANSACTIONAL=true "); } this.tableDDLOptions = optionBuilder.toString(); - this.tableName = TestUtil.DEFAULT_DATA_TABLE_NAME + ( transactional ? "_TXN" : ""); -this.indexName = "IDX" + ( transactional ? "_TXN" : ""); -this.fullTableName = SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, tableName); -this.fullIndexName = SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, indexName); } @BeforeClass @@ -115,6 +113,10 @@ public class IndexIT extends BaseHBaseManagedTimeIT { @Test public void testIndexWithNullableFixedWithCols() throws Exception { + String tableName = "TBL_" + generateRandomString(); + String indexName = "IND_" + generateRandomString(); + String fullTableName = SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, tableName); + String fullIndexName = SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, indexName); Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES); try (Connection conn = DriverManager.getConnection(getUrl(), props)) { conn.setAutoCommit(false); @@
[33/50] [abbrv] phoenix git commit: PHOENIX-3120 AsyncIndexRebuilderTask fails for transactional tables (addendum)
PHOENIX-3120 AsyncIndexRebuilderTask fails for transactional tables (addendum) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/15219d0f Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/15219d0f Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/15219d0f Branch: refs/heads/encodecolumns Commit: 15219d0fa0c0bb0b3b44e7a01b9dce4745851fb7 Parents: 8a7bdb9 Author: Thomas D'SilvaAuthored: Mon Aug 1 12:00:27 2016 -0700 Committer: Thomas D'Silva Committed: Mon Aug 1 12:14:25 2016 -0700 -- .../it/java/org/apache/phoenix/end2end/MutableIndexToolIT.java| 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/15219d0f/phoenix-core/src/it/java/org/apache/phoenix/end2end/MutableIndexToolIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MutableIndexToolIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MutableIndexToolIT.java index c335ff8..cb41d2b 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MutableIndexToolIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MutableIndexToolIT.java @@ -45,8 +45,9 @@ public class MutableIndexToolIT extends BaseOwnClusterHBaseManagedTimeIT { @BeforeClass public static void doSetup() throws Exception { -Map serverProps = Maps.newHashMapWithExpectedSize(1); +Map serverProps = Maps.newHashMapWithExpectedSize(2); serverProps.put(QueryServices.EXTRA_JDBC_ARGUMENTS_ATTRIB, QueryServicesOptions.DEFAULT_EXTRA_JDBC_ARGUMENTS); +serverProps.put(QueryServices.ASYNC_INDEX_AUTO_BUILD_ATTRIB, Boolean.toString(false)); setUpRealDriver(new ReadOnlyProps(serverProps.entrySet().iterator()), ReadOnlyProps.EMPTY_PROPS); }
phoenix git commit: PHOENIX-3120 AsyncIndexRebuilderTask fails for transactional tables (addendum)
Repository: phoenix Updated Branches: refs/heads/4.x-HBase-0.98 8a7bdb9c7 -> 15219d0fa PHOENIX-3120 AsyncIndexRebuilderTask fails for transactional tables (addendum) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/15219d0f Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/15219d0f Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/15219d0f Branch: refs/heads/4.x-HBase-0.98 Commit: 15219d0fa0c0bb0b3b44e7a01b9dce4745851fb7 Parents: 8a7bdb9 Author: Thomas D'SilvaAuthored: Mon Aug 1 12:00:27 2016 -0700 Committer: Thomas D'Silva Committed: Mon Aug 1 12:14:25 2016 -0700 -- .../it/java/org/apache/phoenix/end2end/MutableIndexToolIT.java| 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/15219d0f/phoenix-core/src/it/java/org/apache/phoenix/end2end/MutableIndexToolIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MutableIndexToolIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MutableIndexToolIT.java index c335ff8..cb41d2b 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MutableIndexToolIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MutableIndexToolIT.java @@ -45,8 +45,9 @@ public class MutableIndexToolIT extends BaseOwnClusterHBaseManagedTimeIT { @BeforeClass public static void doSetup() throws Exception { -Map serverProps = Maps.newHashMapWithExpectedSize(1); +Map serverProps = Maps.newHashMapWithExpectedSize(2); serverProps.put(QueryServices.EXTRA_JDBC_ARGUMENTS_ATTRIB, QueryServicesOptions.DEFAULT_EXTRA_JDBC_ARGUMENTS); +serverProps.put(QueryServices.ASYNC_INDEX_AUTO_BUILD_ATTRIB, Boolean.toString(false)); setUpRealDriver(new ReadOnlyProps(serverProps.entrySet().iterator()), ReadOnlyProps.EMPTY_PROPS); }
phoenix git commit: PHOENIX-3120 AsyncIndexRebuilderTask fails for transactional tables (addendum)
Repository: phoenix Updated Branches: refs/heads/4.x-HBase-1.1 28e52ab3b -> c9e3d7d3d PHOENIX-3120 AsyncIndexRebuilderTask fails for transactional tables (addendum) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/c9e3d7d3 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/c9e3d7d3 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/c9e3d7d3 Branch: refs/heads/4.x-HBase-1.1 Commit: c9e3d7d3dfd5a97dffdedeaa9382390367b5e5a4 Parents: 28e52ab Author: Thomas D'SilvaAuthored: Mon Aug 1 12:00:27 2016 -0700 Committer: Thomas D'Silva Committed: Mon Aug 1 12:15:06 2016 -0700 -- .../it/java/org/apache/phoenix/end2end/MutableIndexToolIT.java| 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/c9e3d7d3/phoenix-core/src/it/java/org/apache/phoenix/end2end/MutableIndexToolIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MutableIndexToolIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MutableIndexToolIT.java index c335ff8..cb41d2b 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MutableIndexToolIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MutableIndexToolIT.java @@ -45,8 +45,9 @@ public class MutableIndexToolIT extends BaseOwnClusterHBaseManagedTimeIT { @BeforeClass public static void doSetup() throws Exception { -Map serverProps = Maps.newHashMapWithExpectedSize(1); +Map serverProps = Maps.newHashMapWithExpectedSize(2); serverProps.put(QueryServices.EXTRA_JDBC_ARGUMENTS_ATTRIB, QueryServicesOptions.DEFAULT_EXTRA_JDBC_ARGUMENTS); +serverProps.put(QueryServices.ASYNC_INDEX_AUTO_BUILD_ATTRIB, Boolean.toString(false)); setUpRealDriver(new ReadOnlyProps(serverProps.entrySet().iterator()), ReadOnlyProps.EMPTY_PROPS); }
phoenix git commit: PHOENIX-3120 AsyncIndexRebuilderTask fails for transactional tables (addendum)
Repository: phoenix Updated Branches: refs/heads/4.x-HBase-1.0 a1106a72e -> 971426372 PHOENIX-3120 AsyncIndexRebuilderTask fails for transactional tables (addendum) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/97142637 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/97142637 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/97142637 Branch: refs/heads/4.x-HBase-1.0 Commit: 971426372d34d87a4ce5c6a8101af6f754037a96 Parents: a1106a7 Author: Thomas D'SilvaAuthored: Mon Aug 1 12:00:27 2016 -0700 Committer: Thomas D'Silva Committed: Mon Aug 1 12:14:45 2016 -0700 -- .../it/java/org/apache/phoenix/end2end/MutableIndexToolIT.java| 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/97142637/phoenix-core/src/it/java/org/apache/phoenix/end2end/MutableIndexToolIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MutableIndexToolIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MutableIndexToolIT.java index c335ff8..cb41d2b 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MutableIndexToolIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MutableIndexToolIT.java @@ -45,8 +45,9 @@ public class MutableIndexToolIT extends BaseOwnClusterHBaseManagedTimeIT { @BeforeClass public static void doSetup() throws Exception { -Map serverProps = Maps.newHashMapWithExpectedSize(1); +Map serverProps = Maps.newHashMapWithExpectedSize(2); serverProps.put(QueryServices.EXTRA_JDBC_ARGUMENTS_ATTRIB, QueryServicesOptions.DEFAULT_EXTRA_JDBC_ARGUMENTS); +serverProps.put(QueryServices.ASYNC_INDEX_AUTO_BUILD_ATTRIB, Boolean.toString(false)); setUpRealDriver(new ReadOnlyProps(serverProps.entrySet().iterator()), ReadOnlyProps.EMPTY_PROPS); }
phoenix git commit: PHOENIX-3120 AsyncIndexRebuilderTask fails for transactional tables (addendum)
Repository: phoenix Updated Branches: refs/heads/master 7a27282f2 -> 545cc1c02 PHOENIX-3120 AsyncIndexRebuilderTask fails for transactional tables (addendum) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/545cc1c0 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/545cc1c0 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/545cc1c0 Branch: refs/heads/master Commit: 545cc1c025ec56ef174f117f8d96212457f96363 Parents: 7a27282 Author: Thomas D'SilvaAuthored: Mon Aug 1 12:00:27 2016 -0700 Committer: Thomas D'Silva Committed: Mon Aug 1 12:17:18 2016 -0700 -- .../it/java/org/apache/phoenix/end2end/MutableIndexToolIT.java| 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/545cc1c0/phoenix-core/src/it/java/org/apache/phoenix/end2end/MutableIndexToolIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MutableIndexToolIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MutableIndexToolIT.java index c335ff8..cb41d2b 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MutableIndexToolIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MutableIndexToolIT.java @@ -45,8 +45,9 @@ public class MutableIndexToolIT extends BaseOwnClusterHBaseManagedTimeIT { @BeforeClass public static void doSetup() throws Exception { -Map serverProps = Maps.newHashMapWithExpectedSize(1); +Map serverProps = Maps.newHashMapWithExpectedSize(2); serverProps.put(QueryServices.EXTRA_JDBC_ARGUMENTS_ATTRIB, QueryServicesOptions.DEFAULT_EXTRA_JDBC_ARGUMENTS); +serverProps.put(QueryServices.ASYNC_INDEX_AUTO_BUILD_ATTRIB, Boolean.toString(false)); setUpRealDriver(new ReadOnlyProps(serverProps.entrySet().iterator()), ReadOnlyProps.EMPTY_PROPS); }
phoenix git commit: PHOENIX-3120 AsyncIndexRebuilderTask fails for transactional tables
Repository: phoenix Updated Branches: refs/heads/4.x-HBase-1.0 23ac6a487 -> 47da2cf2f PHOENIX-3120 AsyncIndexRebuilderTask fails for transactional tables Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/47da2cf2 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/47da2cf2 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/47da2cf2 Branch: refs/heads/4.x-HBase-1.0 Commit: 47da2cf2f4716b6455614f62b552931f626de2d7 Parents: 23ac6a4 Author: Thomas D'SilvaAuthored: Thu Jul 28 18:21:45 2016 -0700 Committer: Thomas D'Silva Committed: Fri Jul 29 13:52:29 2016 -0700 -- .../apache/phoenix/end2end/index/IndexIT.java | 108 --- .../coprocessor/MetaDataRegionObserver.java | 34 +++--- .../apache/phoenix/schema/MetaDataClient.java | 11 +- 3 files changed, 120 insertions(+), 33 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/47da2cf2/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexIT.java index ff26208..35a0aad 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexIT.java @@ -42,21 +42,26 @@ import java.util.Properties; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.phoenix.compile.ColumnResolver; import org.apache.phoenix.compile.FromCompiler; +import org.apache.phoenix.coprocessor.generated.PTableProtos.PTableType; import org.apache.phoenix.end2end.BaseHBaseManagedTimeIT; +import org.apache.phoenix.end2end.BaseHBaseManagedTimeTableReuseIT; import org.apache.phoenix.end2end.Shadower; import org.apache.phoenix.exception.SQLExceptionCode; import org.apache.phoenix.jdbc.PhoenixConnection; +import org.apache.phoenix.jdbc.PhoenixDatabaseMetaData; import org.apache.phoenix.jdbc.PhoenixStatement; import org.apache.phoenix.parse.NamedTableNode; import org.apache.phoenix.parse.TableName; import org.apache.phoenix.query.BaseTest; import org.apache.phoenix.query.QueryServices; +import org.apache.phoenix.schema.PIndexState; import org.apache.phoenix.schema.PTable; import org.apache.phoenix.util.DateUtil; import org.apache.phoenix.util.PropertiesUtil; import org.apache.phoenix.util.QueryUtil; import org.apache.phoenix.util.ReadOnlyProps; import org.apache.phoenix.util.SchemaUtil; +import org.apache.phoenix.util.StringUtil; import org.apache.phoenix.util.TestUtil; import org.junit.BeforeClass; import org.junit.Test; @@ -67,16 +72,13 @@ import org.junit.runners.Parameterized.Parameters; import com.google.common.collect.Maps; @RunWith(Parameterized.class) -public class IndexIT extends BaseHBaseManagedTimeIT { - +public class IndexIT extends BaseHBaseManagedTimeTableReuseIT { +private static final long MAX_WAIT_FOR_ASYNC_INDEX_BUILD = 3; + private final boolean localIndex; private final boolean transactional; private final boolean mutable; private final String tableDDLOptions; - private final String tableName; -private final String indexName; -private final String fullTableName; -private final String fullIndexName; public IndexIT(boolean localIndex, boolean mutable, boolean transactional) { this.localIndex = localIndex; @@ -91,10 +93,6 @@ public class IndexIT extends BaseHBaseManagedTimeIT { optionBuilder.append(" TRANSACTIONAL=true "); } this.tableDDLOptions = optionBuilder.toString(); - this.tableName = TestUtil.DEFAULT_DATA_TABLE_NAME + ( transactional ? "_TXN" : ""); -this.indexName = "IDX" + ( transactional ? "_TXN" : ""); -this.fullTableName = SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, tableName); -this.fullIndexName = SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, indexName); } @BeforeClass @@ -115,6 +113,10 @@ public class IndexIT extends BaseHBaseManagedTimeIT { @Test public void testIndexWithNullableFixedWithCols() throws Exception { + String tableName = "TBL_" + generateRandomString(); + String indexName = "IND_" + generateRandomString(); + String fullTableName = SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, tableName); + String fullIndexName = SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, indexName); Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES); try (Connection conn =
phoenix git commit: PHOENIX-3120 AsyncIndexRebuilderTask fails for transactional tables
Repository: phoenix Updated Branches: refs/heads/4.x-HBase-1.1 e8cb5de17 -> 52f8b386d PHOENIX-3120 AsyncIndexRebuilderTask fails for transactional tables Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/52f8b386 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/52f8b386 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/52f8b386 Branch: refs/heads/4.x-HBase-1.1 Commit: 52f8b386d8e9de3a01f9ef30011b0c8d79e2114c Parents: e8cb5de Author: Thomas D'SilvaAuthored: Thu Jul 28 18:21:45 2016 -0700 Committer: Thomas D'Silva Committed: Fri Jul 29 13:52:36 2016 -0700 -- .../apache/phoenix/end2end/index/IndexIT.java | 108 --- .../coprocessor/MetaDataRegionObserver.java | 34 +++--- .../apache/phoenix/schema/MetaDataClient.java | 11 +- 3 files changed, 120 insertions(+), 33 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/52f8b386/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexIT.java index ff26208..35a0aad 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexIT.java @@ -42,21 +42,26 @@ import java.util.Properties; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.phoenix.compile.ColumnResolver; import org.apache.phoenix.compile.FromCompiler; +import org.apache.phoenix.coprocessor.generated.PTableProtos.PTableType; import org.apache.phoenix.end2end.BaseHBaseManagedTimeIT; +import org.apache.phoenix.end2end.BaseHBaseManagedTimeTableReuseIT; import org.apache.phoenix.end2end.Shadower; import org.apache.phoenix.exception.SQLExceptionCode; import org.apache.phoenix.jdbc.PhoenixConnection; +import org.apache.phoenix.jdbc.PhoenixDatabaseMetaData; import org.apache.phoenix.jdbc.PhoenixStatement; import org.apache.phoenix.parse.NamedTableNode; import org.apache.phoenix.parse.TableName; import org.apache.phoenix.query.BaseTest; import org.apache.phoenix.query.QueryServices; +import org.apache.phoenix.schema.PIndexState; import org.apache.phoenix.schema.PTable; import org.apache.phoenix.util.DateUtil; import org.apache.phoenix.util.PropertiesUtil; import org.apache.phoenix.util.QueryUtil; import org.apache.phoenix.util.ReadOnlyProps; import org.apache.phoenix.util.SchemaUtil; +import org.apache.phoenix.util.StringUtil; import org.apache.phoenix.util.TestUtil; import org.junit.BeforeClass; import org.junit.Test; @@ -67,16 +72,13 @@ import org.junit.runners.Parameterized.Parameters; import com.google.common.collect.Maps; @RunWith(Parameterized.class) -public class IndexIT extends BaseHBaseManagedTimeIT { - +public class IndexIT extends BaseHBaseManagedTimeTableReuseIT { +private static final long MAX_WAIT_FOR_ASYNC_INDEX_BUILD = 3; + private final boolean localIndex; private final boolean transactional; private final boolean mutable; private final String tableDDLOptions; - private final String tableName; -private final String indexName; -private final String fullTableName; -private final String fullIndexName; public IndexIT(boolean localIndex, boolean mutable, boolean transactional) { this.localIndex = localIndex; @@ -91,10 +93,6 @@ public class IndexIT extends BaseHBaseManagedTimeIT { optionBuilder.append(" TRANSACTIONAL=true "); } this.tableDDLOptions = optionBuilder.toString(); - this.tableName = TestUtil.DEFAULT_DATA_TABLE_NAME + ( transactional ? "_TXN" : ""); -this.indexName = "IDX" + ( transactional ? "_TXN" : ""); -this.fullTableName = SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, tableName); -this.fullIndexName = SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, indexName); } @BeforeClass @@ -115,6 +113,10 @@ public class IndexIT extends BaseHBaseManagedTimeIT { @Test public void testIndexWithNullableFixedWithCols() throws Exception { + String tableName = "TBL_" + generateRandomString(); + String indexName = "IND_" + generateRandomString(); + String fullTableName = SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, tableName); + String fullIndexName = SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, indexName); Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES); try (Connection conn =
phoenix git commit: PHOENIX-3120 AsyncIndexRebuilderTask fails for transactional tables
Repository: phoenix Updated Branches: refs/heads/4.x-HBase-0.98 3fc406698 -> c37f73f65 PHOENIX-3120 AsyncIndexRebuilderTask fails for transactional tables Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/c37f73f6 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/c37f73f6 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/c37f73f6 Branch: refs/heads/4.x-HBase-0.98 Commit: c37f73f659ea9192c0e806bb783f43fd22560f67 Parents: 3fc4066 Author: Thomas D'SilvaAuthored: Thu Jul 28 18:21:45 2016 -0700 Committer: Thomas D'Silva Committed: Fri Jul 29 13:52:14 2016 -0700 -- .../apache/phoenix/end2end/index/IndexIT.java | 108 --- .../coprocessor/MetaDataRegionObserver.java | 34 +++--- .../apache/phoenix/schema/MetaDataClient.java | 11 +- 3 files changed, 120 insertions(+), 33 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/c37f73f6/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexIT.java index ff26208..35a0aad 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexIT.java @@ -42,21 +42,26 @@ import java.util.Properties; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.phoenix.compile.ColumnResolver; import org.apache.phoenix.compile.FromCompiler; +import org.apache.phoenix.coprocessor.generated.PTableProtos.PTableType; import org.apache.phoenix.end2end.BaseHBaseManagedTimeIT; +import org.apache.phoenix.end2end.BaseHBaseManagedTimeTableReuseIT; import org.apache.phoenix.end2end.Shadower; import org.apache.phoenix.exception.SQLExceptionCode; import org.apache.phoenix.jdbc.PhoenixConnection; +import org.apache.phoenix.jdbc.PhoenixDatabaseMetaData; import org.apache.phoenix.jdbc.PhoenixStatement; import org.apache.phoenix.parse.NamedTableNode; import org.apache.phoenix.parse.TableName; import org.apache.phoenix.query.BaseTest; import org.apache.phoenix.query.QueryServices; +import org.apache.phoenix.schema.PIndexState; import org.apache.phoenix.schema.PTable; import org.apache.phoenix.util.DateUtil; import org.apache.phoenix.util.PropertiesUtil; import org.apache.phoenix.util.QueryUtil; import org.apache.phoenix.util.ReadOnlyProps; import org.apache.phoenix.util.SchemaUtil; +import org.apache.phoenix.util.StringUtil; import org.apache.phoenix.util.TestUtil; import org.junit.BeforeClass; import org.junit.Test; @@ -67,16 +72,13 @@ import org.junit.runners.Parameterized.Parameters; import com.google.common.collect.Maps; @RunWith(Parameterized.class) -public class IndexIT extends BaseHBaseManagedTimeIT { - +public class IndexIT extends BaseHBaseManagedTimeTableReuseIT { +private static final long MAX_WAIT_FOR_ASYNC_INDEX_BUILD = 3; + private final boolean localIndex; private final boolean transactional; private final boolean mutable; private final String tableDDLOptions; - private final String tableName; -private final String indexName; -private final String fullTableName; -private final String fullIndexName; public IndexIT(boolean localIndex, boolean mutable, boolean transactional) { this.localIndex = localIndex; @@ -91,10 +93,6 @@ public class IndexIT extends BaseHBaseManagedTimeIT { optionBuilder.append(" TRANSACTIONAL=true "); } this.tableDDLOptions = optionBuilder.toString(); - this.tableName = TestUtil.DEFAULT_DATA_TABLE_NAME + ( transactional ? "_TXN" : ""); -this.indexName = "IDX" + ( transactional ? "_TXN" : ""); -this.fullTableName = SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, tableName); -this.fullIndexName = SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, indexName); } @BeforeClass @@ -115,6 +113,10 @@ public class IndexIT extends BaseHBaseManagedTimeIT { @Test public void testIndexWithNullableFixedWithCols() throws Exception { + String tableName = "TBL_" + generateRandomString(); + String indexName = "IND_" + generateRandomString(); + String fullTableName = SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, tableName); + String fullIndexName = SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, indexName); Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES); try (Connection conn =
phoenix git commit: PHOENIX-3120 AsyncIndexRebuilderTask fails for transactional tables
Repository: phoenix Updated Branches: refs/heads/master cb21c8175 -> 3251ac58a PHOENIX-3120 AsyncIndexRebuilderTask fails for transactional tables Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/3251ac58 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/3251ac58 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/3251ac58 Branch: refs/heads/master Commit: 3251ac58a6a9de890285ae82ba86d76618fa0a1c Parents: cb21c81 Author: Thomas D'SilvaAuthored: Thu Jul 28 18:21:45 2016 -0700 Committer: Thomas D'Silva Committed: Fri Jul 29 13:53:59 2016 -0700 -- .../apache/phoenix/end2end/index/IndexIT.java | 108 --- .../coprocessor/MetaDataRegionObserver.java | 34 +++--- .../apache/phoenix/schema/MetaDataClient.java | 11 +- 3 files changed, 120 insertions(+), 33 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/3251ac58/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexIT.java index ff26208..35a0aad 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexIT.java @@ -42,21 +42,26 @@ import java.util.Properties; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.phoenix.compile.ColumnResolver; import org.apache.phoenix.compile.FromCompiler; +import org.apache.phoenix.coprocessor.generated.PTableProtos.PTableType; import org.apache.phoenix.end2end.BaseHBaseManagedTimeIT; +import org.apache.phoenix.end2end.BaseHBaseManagedTimeTableReuseIT; import org.apache.phoenix.end2end.Shadower; import org.apache.phoenix.exception.SQLExceptionCode; import org.apache.phoenix.jdbc.PhoenixConnection; +import org.apache.phoenix.jdbc.PhoenixDatabaseMetaData; import org.apache.phoenix.jdbc.PhoenixStatement; import org.apache.phoenix.parse.NamedTableNode; import org.apache.phoenix.parse.TableName; import org.apache.phoenix.query.BaseTest; import org.apache.phoenix.query.QueryServices; +import org.apache.phoenix.schema.PIndexState; import org.apache.phoenix.schema.PTable; import org.apache.phoenix.util.DateUtil; import org.apache.phoenix.util.PropertiesUtil; import org.apache.phoenix.util.QueryUtil; import org.apache.phoenix.util.ReadOnlyProps; import org.apache.phoenix.util.SchemaUtil; +import org.apache.phoenix.util.StringUtil; import org.apache.phoenix.util.TestUtil; import org.junit.BeforeClass; import org.junit.Test; @@ -67,16 +72,13 @@ import org.junit.runners.Parameterized.Parameters; import com.google.common.collect.Maps; @RunWith(Parameterized.class) -public class IndexIT extends BaseHBaseManagedTimeIT { - +public class IndexIT extends BaseHBaseManagedTimeTableReuseIT { +private static final long MAX_WAIT_FOR_ASYNC_INDEX_BUILD = 3; + private final boolean localIndex; private final boolean transactional; private final boolean mutable; private final String tableDDLOptions; - private final String tableName; -private final String indexName; -private final String fullTableName; -private final String fullIndexName; public IndexIT(boolean localIndex, boolean mutable, boolean transactional) { this.localIndex = localIndex; @@ -91,10 +93,6 @@ public class IndexIT extends BaseHBaseManagedTimeIT { optionBuilder.append(" TRANSACTIONAL=true "); } this.tableDDLOptions = optionBuilder.toString(); - this.tableName = TestUtil.DEFAULT_DATA_TABLE_NAME + ( transactional ? "_TXN" : ""); -this.indexName = "IDX" + ( transactional ? "_TXN" : ""); -this.fullTableName = SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, tableName); -this.fullIndexName = SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, indexName); } @BeforeClass @@ -115,6 +113,10 @@ public class IndexIT extends BaseHBaseManagedTimeIT { @Test public void testIndexWithNullableFixedWithCols() throws Exception { + String tableName = "TBL_" + generateRandomString(); + String indexName = "IND_" + generateRandomString(); + String fullTableName = SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, tableName); + String fullIndexName = SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, indexName); Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES); try (Connection conn =