phoenix git commit: PHOENIX-4530 Do not collect delete markers during major compaction of table with disabled mutable indexes
Repository: phoenix Updated Branches: refs/heads/5.x-HBase-2.0 3c1b3b547 -> 81f7b6713 PHOENIX-4530 Do not collect delete markers during major compaction of table with disabled mutable indexes Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/81f7b671 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/81f7b671 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/81f7b671 Branch: refs/heads/5.x-HBase-2.0 Commit: 81f7b67134285a3649809a9bcc4d4e9a19f9f3cb Parents: 3c1b3b5 Author: Vincent Poon Authored: Wed Apr 4 13:28:23 2018 -0700 Committer: Vincent Poon Committed: Thu Apr 5 17:49:45 2018 -0700 -- .../PartialScannerResultsDisabledIT.java| 2 +- .../UngroupedAggregateRegionObserverIT.java | 171 --- .../phoenix/end2end/index/MutableIndexIT.java | 58 ++- .../end2end/index/PartialIndexRebuilderIT.java | 2 +- .../UngroupedAggregateRegionObserver.java | 125 +- .../java/org/apache/phoenix/util/TestUtil.java | 19 +++ 6 files changed, 120 insertions(+), 257 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/81f7b671/phoenix-core/src/it/java/org/apache/phoenix/end2end/PartialScannerResultsDisabledIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PartialScannerResultsDisabledIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PartialScannerResultsDisabledIT.java index 817b0bd..59471dd 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PartialScannerResultsDisabledIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PartialScannerResultsDisabledIT.java @@ -151,7 +151,7 @@ public class PartialScannerResultsDisabledIT extends ParallelStatsDisabledIT { return RandomStringUtils.randomAlphabetic(length); } -private void writeSingleBatch(Connection connection, int batchSize, int numBatches, String tableName) throws Exception { +public static void writeSingleBatch(Connection connection, int batchSize, int numBatches, String tableName) throws Exception { for (int j = 0; j < numBatches; j++) { try (PreparedStatement statement = connection.prepareStatement(String.format(UPSERT_INTO_DATA_TABLE, tableName))) { http://git-wip-us.apache.org/repos/asf/phoenix/blob/81f7b671/phoenix-core/src/it/java/org/apache/phoenix/end2end/UngroupedAggregateRegionObserverIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UngroupedAggregateRegionObserverIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UngroupedAggregateRegionObserverIT.java deleted file mode 100644 index 0ae1bb5..000 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UngroupedAggregateRegionObserverIT.java +++ /dev/null @@ -1,171 +0,0 @@ -/* - * 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.phoenix.end2end; - -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.assertTrue; -import static org.mockito.Mockito.never; - -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.SQLException; - -import org.apache.hadoop.hbase.HBaseTestingUtility; -import org.apache.log4j.Appender; -import org.apache.log4j.Level; -import org.apache.log4j.LogManager; -import org.apache.log4j.spi.LoggingEvent; -import org.apache.phoenix.coprocessor.UngroupedAggregateRegionObserver; -import org.apache.phoenix.jdbc.PhoenixConnection; -import org.apache.phoenix.schema.PIndexState; -import org.apache.phoenix.util.EnvironmentEdgeManager; -import org.apache.phoenix.util.IndexUtil; -import org.apache.phoenix.util.PropertiesUtil; -import org.apache.phoenix.util.SchemaUtil; -import org.apache.phoenix.util.TestUtil; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.ArgumentCa
phoenix git commit: PHOENIX-4530 Do not collect delete markers during major compaction of table with disabled mutable indexes
Repository: phoenix Updated Branches: refs/heads/master f355be008 -> 0fca6ca21 PHOENIX-4530 Do not collect delete markers during major compaction of table with disabled mutable indexes Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/0fca6ca2 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/0fca6ca2 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/0fca6ca2 Branch: refs/heads/master Commit: 0fca6ca215e3f585069c9df23a7ec5c8b64e8e77 Parents: f355be0 Author: Vincent Poon Authored: Tue Feb 20 18:14:50 2018 -0800 Committer: Vincent Poon Committed: Thu Feb 22 16:46:45 2018 -0800 -- .../PartialScannerResultsDisabledIT.java| 2 +- .../UngroupedAggregateRegionObserverIT.java | 171 --- .../phoenix/end2end/index/MutableIndexIT.java | 55 ++ .../end2end/index/PartialIndexRebuilderIT.java | 39 - .../UngroupedAggregateRegionObserver.java | 121 + .../java/org/apache/phoenix/util/TestUtil.java | 19 +++ 6 files changed, 116 insertions(+), 291 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/0fca6ca2/phoenix-core/src/it/java/org/apache/phoenix/end2end/PartialScannerResultsDisabledIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PartialScannerResultsDisabledIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PartialScannerResultsDisabledIT.java index 817b0bd..59471dd 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PartialScannerResultsDisabledIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PartialScannerResultsDisabledIT.java @@ -151,7 +151,7 @@ public class PartialScannerResultsDisabledIT extends ParallelStatsDisabledIT { return RandomStringUtils.randomAlphabetic(length); } -private void writeSingleBatch(Connection connection, int batchSize, int numBatches, String tableName) throws Exception { +public static void writeSingleBatch(Connection connection, int batchSize, int numBatches, String tableName) throws Exception { for (int j = 0; j < numBatches; j++) { try (PreparedStatement statement = connection.prepareStatement(String.format(UPSERT_INTO_DATA_TABLE, tableName))) { http://git-wip-us.apache.org/repos/asf/phoenix/blob/0fca6ca2/phoenix-core/src/it/java/org/apache/phoenix/end2end/UngroupedAggregateRegionObserverIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UngroupedAggregateRegionObserverIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UngroupedAggregateRegionObserverIT.java deleted file mode 100644 index 0ae1bb5..000 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UngroupedAggregateRegionObserverIT.java +++ /dev/null @@ -1,171 +0,0 @@ -/* - * 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.phoenix.end2end; - -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.assertTrue; -import static org.mockito.Mockito.never; - -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.SQLException; - -import org.apache.hadoop.hbase.HBaseTestingUtility; -import org.apache.log4j.Appender; -import org.apache.log4j.Level; -import org.apache.log4j.LogManager; -import org.apache.log4j.spi.LoggingEvent; -import org.apache.phoenix.coprocessor.UngroupedAggregateRegionObserver; -import org.apache.phoenix.jdbc.PhoenixConnection; -import org.apache.phoenix.schema.PIndexState; -import org.apache.phoenix.util.EnvironmentEdgeManager; -import org.apache.phoenix.util.IndexUtil; -import org.apache.phoenix.util.PropertiesUtil; -import org.apache.phoenix.util.SchemaUtil; -import org.apache.phoenix.util.TestUtil; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.ArgumentCaptor; -impo
phoenix git commit: PHOENIX-4530 Do not collect delete markers during major compaction of table with disabled mutable indexes
Repository: phoenix Updated Branches: refs/heads/4.x-HBase-1.3 cb682c9a1 -> e8d3ed00c PHOENIX-4530 Do not collect delete markers during major compaction of table with disabled mutable indexes Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/e8d3ed00 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/e8d3ed00 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/e8d3ed00 Branch: refs/heads/4.x-HBase-1.3 Commit: e8d3ed00cb2d44b35ebad019635cbbdc9a652681 Parents: cb682c9 Author: Vincent Poon Authored: Tue Feb 20 18:14:50 2018 -0800 Committer: Vincent Poon Committed: Thu Feb 22 16:47:27 2018 -0800 -- .../PartialScannerResultsDisabledIT.java| 2 +- .../UngroupedAggregateRegionObserverIT.java | 171 --- .../phoenix/end2end/index/MutableIndexIT.java | 55 ++ .../end2end/index/PartialIndexRebuilderIT.java | 39 - .../UngroupedAggregateRegionObserver.java | 121 + .../java/org/apache/phoenix/util/TestUtil.java | 19 +++ 6 files changed, 116 insertions(+), 291 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/e8d3ed00/phoenix-core/src/it/java/org/apache/phoenix/end2end/PartialScannerResultsDisabledIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PartialScannerResultsDisabledIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PartialScannerResultsDisabledIT.java index 817b0bd..59471dd 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PartialScannerResultsDisabledIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PartialScannerResultsDisabledIT.java @@ -151,7 +151,7 @@ public class PartialScannerResultsDisabledIT extends ParallelStatsDisabledIT { return RandomStringUtils.randomAlphabetic(length); } -private void writeSingleBatch(Connection connection, int batchSize, int numBatches, String tableName) throws Exception { +public static void writeSingleBatch(Connection connection, int batchSize, int numBatches, String tableName) throws Exception { for (int j = 0; j < numBatches; j++) { try (PreparedStatement statement = connection.prepareStatement(String.format(UPSERT_INTO_DATA_TABLE, tableName))) { http://git-wip-us.apache.org/repos/asf/phoenix/blob/e8d3ed00/phoenix-core/src/it/java/org/apache/phoenix/end2end/UngroupedAggregateRegionObserverIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UngroupedAggregateRegionObserverIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UngroupedAggregateRegionObserverIT.java deleted file mode 100644 index 0ae1bb5..000 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UngroupedAggregateRegionObserverIT.java +++ /dev/null @@ -1,171 +0,0 @@ -/* - * 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.phoenix.end2end; - -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.assertTrue; -import static org.mockito.Mockito.never; - -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.SQLException; - -import org.apache.hadoop.hbase.HBaseTestingUtility; -import org.apache.log4j.Appender; -import org.apache.log4j.Level; -import org.apache.log4j.LogManager; -import org.apache.log4j.spi.LoggingEvent; -import org.apache.phoenix.coprocessor.UngroupedAggregateRegionObserver; -import org.apache.phoenix.jdbc.PhoenixConnection; -import org.apache.phoenix.schema.PIndexState; -import org.apache.phoenix.util.EnvironmentEdgeManager; -import org.apache.phoenix.util.IndexUtil; -import org.apache.phoenix.util.PropertiesUtil; -import org.apache.phoenix.util.SchemaUtil; -import org.apache.phoenix.util.TestUtil; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.Argumen
phoenix git commit: PHOENIX-4530 Do not collect delete markers during major compaction of table with disabled mutable indexes
Repository: phoenix Updated Branches: refs/heads/4.x-HBase-1.2 d4c04fae9 -> e83202a2d PHOENIX-4530 Do not collect delete markers during major compaction of table with disabled mutable indexes Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/e83202a2 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/e83202a2 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/e83202a2 Branch: refs/heads/4.x-HBase-1.2 Commit: e83202a2da6897d81a10b6b9c9980a83e79942b4 Parents: d4c04fa Author: Vincent Poon Authored: Tue Feb 20 18:14:50 2018 -0800 Committer: Vincent Poon Committed: Thu Feb 22 16:47:54 2018 -0800 -- .../PartialScannerResultsDisabledIT.java| 2 +- .../UngroupedAggregateRegionObserverIT.java | 171 --- .../phoenix/end2end/index/MutableIndexIT.java | 55 ++ .../end2end/index/PartialIndexRebuilderIT.java | 39 - .../UngroupedAggregateRegionObserver.java | 121 + .../java/org/apache/phoenix/util/TestUtil.java | 19 +++ 6 files changed, 116 insertions(+), 291 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/e83202a2/phoenix-core/src/it/java/org/apache/phoenix/end2end/PartialScannerResultsDisabledIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PartialScannerResultsDisabledIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PartialScannerResultsDisabledIT.java index 817b0bd..59471dd 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PartialScannerResultsDisabledIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PartialScannerResultsDisabledIT.java @@ -151,7 +151,7 @@ public class PartialScannerResultsDisabledIT extends ParallelStatsDisabledIT { return RandomStringUtils.randomAlphabetic(length); } -private void writeSingleBatch(Connection connection, int batchSize, int numBatches, String tableName) throws Exception { +public static void writeSingleBatch(Connection connection, int batchSize, int numBatches, String tableName) throws Exception { for (int j = 0; j < numBatches; j++) { try (PreparedStatement statement = connection.prepareStatement(String.format(UPSERT_INTO_DATA_TABLE, tableName))) { http://git-wip-us.apache.org/repos/asf/phoenix/blob/e83202a2/phoenix-core/src/it/java/org/apache/phoenix/end2end/UngroupedAggregateRegionObserverIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UngroupedAggregateRegionObserverIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UngroupedAggregateRegionObserverIT.java deleted file mode 100644 index 0ae1bb5..000 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UngroupedAggregateRegionObserverIT.java +++ /dev/null @@ -1,171 +0,0 @@ -/* - * 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.phoenix.end2end; - -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.assertTrue; -import static org.mockito.Mockito.never; - -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.SQLException; - -import org.apache.hadoop.hbase.HBaseTestingUtility; -import org.apache.log4j.Appender; -import org.apache.log4j.Level; -import org.apache.log4j.LogManager; -import org.apache.log4j.spi.LoggingEvent; -import org.apache.phoenix.coprocessor.UngroupedAggregateRegionObserver; -import org.apache.phoenix.jdbc.PhoenixConnection; -import org.apache.phoenix.schema.PIndexState; -import org.apache.phoenix.util.EnvironmentEdgeManager; -import org.apache.phoenix.util.IndexUtil; -import org.apache.phoenix.util.PropertiesUtil; -import org.apache.phoenix.util.SchemaUtil; -import org.apache.phoenix.util.TestUtil; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.Argumen
phoenix git commit: PHOENIX-4530 Do not collect delete markers during major compaction of table with disabled mutable indexes
Repository: phoenix Updated Branches: refs/heads/4.x-HBase-0.98 4fc3f7545 -> 178405d70 PHOENIX-4530 Do not collect delete markers during major compaction of table with disabled mutable indexes Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/178405d7 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/178405d7 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/178405d7 Branch: refs/heads/4.x-HBase-0.98 Commit: 178405d7012b05a683da57f5f2e53480e1dd6aed Parents: 4fc3f75 Author: Vincent Poon Authored: Thu Feb 22 17:14:16 2018 -0800 Committer: Vincent Poon Committed: Thu Feb 22 17:16:20 2018 -0800 -- .../PartialScannerResultsDisabledIT.java| 193 ++ .../UngroupedAggregateRegionObserverIT.java | 199 --- .../phoenix/end2end/index/MutableIndexIT.java | 57 ++ .../end2end/index/PartialIndexRebuilderIT.java | 39 .../UngroupedAggregateRegionObserver.java | 130 +--- .../java/org/apache/phoenix/util/TestUtil.java | 19 ++ 6 files changed, 314 insertions(+), 323 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/178405d7/phoenix-core/src/it/java/org/apache/phoenix/end2end/PartialScannerResultsDisabledIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PartialScannerResultsDisabledIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PartialScannerResultsDisabledIT.java new file mode 100644 index 000..59471dd --- /dev/null +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PartialScannerResultsDisabledIT.java @@ -0,0 +1,193 @@ +/* + * 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.phoenix.end2end; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; + +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; +import java.sql.Timestamp; +import java.util.Properties; +import java.util.Random; +import java.util.UUID; +import java.util.concurrent.atomic.AtomicInteger; + +import org.apache.commons.lang.RandomStringUtils; +import org.apache.hadoop.hbase.HConstants; +import org.apache.phoenix.util.IndexScrutiny; +import org.apache.phoenix.util.SchemaUtil; +import org.junit.Before; +import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class PartialScannerResultsDisabledIT extends ParallelStatsDisabledIT { +public static final String TEST_TABLE_DDL = +"CREATE TABLE IF NOT EXISTS %s\n" + "(\n" + "ORGANIZATION_ID CHAR(15) NOT NULL,\n" ++ "FEED_ELEMENT_ID CHAR(15) NOT NULL,\n" ++ "CONTAINER_ID CHAR(15) NOT NULL,\n" ++ "FEED_TYPE VARCHAR(1) NOT NULL, \n" ++ "NETWORK_ID CHAR(15) NOT NULL,\n" + "USER_ID CHAR(15) NOT NULL,\n" ++ "CREATED_TIME TIMESTAMP,\n" + "LAST_UPDATE TIMESTAMP,\n" ++ "RELEVANCE_SCORE DOUBLE,\n" + "FEED_ITEM_TYPE VARCHAR(1),\n" ++ "FEED_ELEMENT_TYPE VARCHAR(1),\n" ++ "FEED_ELEMENT_IS_SYS_GEN BOOLEAN,\n" ++ "FEED_ELEMENT_STATUS VARCHAR(1),\n" ++ "FEED_ELEMENT_VISIBILITY VARCHAR(1),\n" + " PARENT_ID CHAR(15),\n" ++ "CREATED_BY CHAR(15),\n" + "BEST_COMMENT_ID CHAR(15),\n" ++ "COMMENT_COUNT INTEGER,\n" + "CONSTRAINT PK PRIMARY KEY\n" + "(\n" ++ "ORGANIZATION_ID,\n" + " FEED_ELEMENT_ID,\n" ++ "CONTAINER_ID,\n" + "FEED_TYPE,\n" + " NETWORK_ID,\n" ++ "USER_ID\n" + ")\n" + ") COLUMN_ENCODED_BYTES = 0"; + +public static final String INDEX_1_DDL = +"CREATE INDEX IF NOT EXISTS %s\n" + "ON
phoenix git commit: PHOENIX-4530 Do not collect delete markers during major compaction of table with disabled mutable indexes
Repository: phoenix Updated Branches: refs/heads/4.x-HBase-1.1 650666075 -> d78023017 PHOENIX-4530 Do not collect delete markers during major compaction of table with disabled mutable indexes Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/d7802301 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/d7802301 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/d7802301 Branch: refs/heads/4.x-HBase-1.1 Commit: d7802301707fe575612098c9f54b6659c87c91a0 Parents: 6506660 Author: Vincent Poon Authored: Thu Feb 22 16:56:36 2018 -0800 Committer: Vincent Poon Committed: Thu Feb 22 17:15:49 2018 -0800 -- .../PartialScannerResultsDisabledIT.java| 2 +- .../UngroupedAggregateRegionObserverIT.java | 171 --- .../phoenix/end2end/index/MutableIndexIT.java | 57 +++ .../end2end/index/PartialIndexRebuilderIT.java | 39 - .../UngroupedAggregateRegionObserver.java | 121 + .../java/org/apache/phoenix/util/TestUtil.java | 19 +++ 6 files changed, 118 insertions(+), 291 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/d7802301/phoenix-core/src/it/java/org/apache/phoenix/end2end/PartialScannerResultsDisabledIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PartialScannerResultsDisabledIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PartialScannerResultsDisabledIT.java index 817b0bd..59471dd 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PartialScannerResultsDisabledIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PartialScannerResultsDisabledIT.java @@ -151,7 +151,7 @@ public class PartialScannerResultsDisabledIT extends ParallelStatsDisabledIT { return RandomStringUtils.randomAlphabetic(length); } -private void writeSingleBatch(Connection connection, int batchSize, int numBatches, String tableName) throws Exception { +public static void writeSingleBatch(Connection connection, int batchSize, int numBatches, String tableName) throws Exception { for (int j = 0; j < numBatches; j++) { try (PreparedStatement statement = connection.prepareStatement(String.format(UPSERT_INTO_DATA_TABLE, tableName))) { http://git-wip-us.apache.org/repos/asf/phoenix/blob/d7802301/phoenix-core/src/it/java/org/apache/phoenix/end2end/UngroupedAggregateRegionObserverIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UngroupedAggregateRegionObserverIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UngroupedAggregateRegionObserverIT.java deleted file mode 100644 index 0ae1bb5..000 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UngroupedAggregateRegionObserverIT.java +++ /dev/null @@ -1,171 +0,0 @@ -/* - * 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.phoenix.end2end; - -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.assertTrue; -import static org.mockito.Mockito.never; - -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.SQLException; - -import org.apache.hadoop.hbase.HBaseTestingUtility; -import org.apache.log4j.Appender; -import org.apache.log4j.Level; -import org.apache.log4j.LogManager; -import org.apache.log4j.spi.LoggingEvent; -import org.apache.phoenix.coprocessor.UngroupedAggregateRegionObserver; -import org.apache.phoenix.jdbc.PhoenixConnection; -import org.apache.phoenix.schema.PIndexState; -import org.apache.phoenix.util.EnvironmentEdgeManager; -import org.apache.phoenix.util.IndexUtil; -import org.apache.phoenix.util.PropertiesUtil; -import org.apache.phoenix.util.SchemaUtil; -import org.apache.phoenix.util.TestUtil; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.Argume
phoenix git commit: PHOENIX-4530 Do not collect delete markers during major compaction of table with disabled mutable indexes
Repository: phoenix Updated Branches: refs/heads/4.x-cdh5.11.2 b56a3dbdf -> 1499bd89f PHOENIX-4530 Do not collect delete markers during major compaction of table with disabled mutable indexes Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/1499bd89 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/1499bd89 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/1499bd89 Branch: refs/heads/4.x-cdh5.11.2 Commit: 1499bd89f29c8e2a655f4090d332f11f89f6093e Parents: b56a3db Author: Vincent Poon Authored: Wed Feb 21 02:14:50 2018 + Committer: Pedro Boado Committed: Sat Feb 24 20:06:18 2018 + -- .../PartialScannerResultsDisabledIT.java| 2 +- .../UngroupedAggregateRegionObserverIT.java | 171 --- .../phoenix/end2end/index/MutableIndexIT.java | 55 ++ .../end2end/index/PartialIndexRebuilderIT.java | 39 - .../UngroupedAggregateRegionObserver.java | 121 + .../java/org/apache/phoenix/util/TestUtil.java | 19 +++ 6 files changed, 116 insertions(+), 291 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/1499bd89/phoenix-core/src/it/java/org/apache/phoenix/end2end/PartialScannerResultsDisabledIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PartialScannerResultsDisabledIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PartialScannerResultsDisabledIT.java index 817b0bd..59471dd 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PartialScannerResultsDisabledIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PartialScannerResultsDisabledIT.java @@ -151,7 +151,7 @@ public class PartialScannerResultsDisabledIT extends ParallelStatsDisabledIT { return RandomStringUtils.randomAlphabetic(length); } -private void writeSingleBatch(Connection connection, int batchSize, int numBatches, String tableName) throws Exception { +public static void writeSingleBatch(Connection connection, int batchSize, int numBatches, String tableName) throws Exception { for (int j = 0; j < numBatches; j++) { try (PreparedStatement statement = connection.prepareStatement(String.format(UPSERT_INTO_DATA_TABLE, tableName))) { http://git-wip-us.apache.org/repos/asf/phoenix/blob/1499bd89/phoenix-core/src/it/java/org/apache/phoenix/end2end/UngroupedAggregateRegionObserverIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UngroupedAggregateRegionObserverIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UngroupedAggregateRegionObserverIT.java deleted file mode 100644 index 0ae1bb5..000 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UngroupedAggregateRegionObserverIT.java +++ /dev/null @@ -1,171 +0,0 @@ -/* - * 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.phoenix.end2end; - -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.assertTrue; -import static org.mockito.Mockito.never; - -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.SQLException; - -import org.apache.hadoop.hbase.HBaseTestingUtility; -import org.apache.log4j.Appender; -import org.apache.log4j.Level; -import org.apache.log4j.LogManager; -import org.apache.log4j.spi.LoggingEvent; -import org.apache.phoenix.coprocessor.UngroupedAggregateRegionObserver; -import org.apache.phoenix.jdbc.PhoenixConnection; -import org.apache.phoenix.schema.PIndexState; -import org.apache.phoenix.util.EnvironmentEdgeManager; -import org.apache.phoenix.util.IndexUtil; -import org.apache.phoenix.util.PropertiesUtil; -import org.apache.phoenix.util.SchemaUtil; -import org.apache.phoenix.util.TestUtil; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.Argument