You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by ja...@apache.org on 2017/09/11 21:51:05 UTC
[1/3] phoenix git commit: PHOENIX-4192 Remove unnecessary cast in
TestPropertyPolicy
Repository: phoenix
Updated Branches:
refs/heads/4.x-HBase-1.1 ee9962cd6 -> 2b78e48f4
PHOENIX-4192 Remove unnecessary cast in TestPropertyPolicy
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/23bb1c6f
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/23bb1c6f
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/23bb1c6f
Branch: refs/heads/4.x-HBase-1.1
Commit: 23bb1c6fcd20b548ebf01c0763d88e8618c09b08
Parents: ee9962c
Author: James Taylor <jt...@salesforce.com>
Authored: Mon Sep 11 11:53:36 2017 -0700
Committer: James Taylor <jt...@salesforce.com>
Committed: Mon Sep 11 14:49:23 2017 -0700
----------------------------------------------------------------------
.../test/java/org/apache/phoenix/query/TestPropertyPolicy.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/23bb1c6f/phoenix-core/src/test/java/org/apache/phoenix/query/TestPropertyPolicy.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/test/java/org/apache/phoenix/query/TestPropertyPolicy.java b/phoenix-core/src/test/java/org/apache/phoenix/query/TestPropertyPolicy.java
index 8573bff..1835437 100644
--- a/phoenix-core/src/test/java/org/apache/phoenix/query/TestPropertyPolicy.java
+++ b/phoenix-core/src/test/java/org/apache/phoenix/query/TestPropertyPolicy.java
@@ -17,14 +17,14 @@
*/
package org.apache.phoenix.query;
-import org.apache.hadoop.conf.Configuration;
+import static java.util.Arrays.asList;
import java.util.Collections;
import java.util.HashSet;
import java.util.Properties;
import java.util.Set;
-import static java.util.Arrays.asList;
+import org.apache.hadoop.conf.Configuration;
/**
* Configuration factory that populates an {@link Configuration} with static and runtime
@@ -39,7 +39,7 @@ public class TestPropertyPolicy implements PropertyPolicy {
for (Object k : properties.keySet()) {
if (propertiesKeyDisAllowed.contains(k))
- offendingProperties.put((String) k, properties.getProperty((String) k));
+ offendingProperties.put(k, properties.getProperty((String) k));
}
if (offendingProperties.size() > 0) throw new PropertyNotAllowedException(offendingProperties);
[2/3] phoenix git commit: PHOENIX-4190 Salted local index failure is
causing region server to abort
Posted by ja...@apache.org.
PHOENIX-4190 Salted local index failure is causing region server to abort
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/1c4e09f3
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/1c4e09f3
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/1c4e09f3
Branch: refs/heads/4.x-HBase-1.1
Commit: 1c4e09f3b5baa24d250b9c44b076b816bef8b6e5
Parents: 23bb1c6
Author: James Taylor <jt...@salesforce.com>
Authored: Mon Sep 11 12:21:50 2017 -0700
Committer: James Taylor <jt...@salesforce.com>
Committed: Mon Sep 11 14:49:43 2017 -0700
----------------------------------------------------------------------
.../main/java/org/apache/phoenix/index/IndexMaintainer.java | 2 +-
.../org/apache/phoenix/index/PhoenixIndexFailurePolicy.java | 7 ++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/1c4e09f3/phoenix-core/src/main/java/org/apache/phoenix/index/IndexMaintainer.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/index/IndexMaintainer.java b/phoenix-core/src/main/java/org/apache/phoenix/index/IndexMaintainer.java
index 840d535..c5c3dda 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/index/IndexMaintainer.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/index/IndexMaintainer.java
@@ -784,7 +784,7 @@ public class IndexMaintainer implements Writable, Iterable<ColumnReference> {
assert (isLocalIndex);
ImmutableBytesPtr ptr =
new ImmutableBytesPtr(indexRowKeyPtr.get(),( indexRowKeyPtr.getOffset()
- + (nIndexSaltBuckets > 0 ? 1 : 0)), viewIndexId.length);
+ + (!isLocalIndex && nIndexSaltBuckets > 0 ? 1 : 0)), viewIndexId.length);
return ptr.copyBytesIfNecessary();
}
http://git-wip-us.apache.org/repos/asf/phoenix/blob/1c4e09f3/phoenix-core/src/main/java/org/apache/phoenix/index/PhoenixIndexFailurePolicy.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/index/PhoenixIndexFailurePolicy.java b/phoenix-core/src/main/java/org/apache/phoenix/index/PhoenixIndexFailurePolicy.java
index c91e36e..671e3ef 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/index/PhoenixIndexFailurePolicy.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/index/PhoenixIndexFailurePolicy.java
@@ -39,6 +39,7 @@ import org.apache.hadoop.hbase.client.HTableInterface;
import org.apache.hadoop.hbase.client.Mutation;
import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment;
import org.apache.hadoop.hbase.io.ImmutableBytesWritable;
+import org.apache.hadoop.hbase.util.Bytes;
import org.apache.phoenix.coprocessor.MetaDataProtocol.MetaDataMutationResult;
import org.apache.phoenix.coprocessor.MetaDataProtocol.MutationCode;
import org.apache.phoenix.hbase.index.table.HTableInterfaceReference;
@@ -288,7 +289,11 @@ public class PhoenixIndexFailurePolicy extends DelegateIndexFailurePolicy {
new ImmutableBytesWritable(mutation.getRow(), offset,
mutation.getRow().length - offset));
String indexTableName = localIndexNames.get(new ImmutableBytesWritable(viewId));
- indexTableNames.add(indexTableName);
+ if (indexTableName == null) {
+ LOG.error("Unable to find local index on " + ref.getTableName() + " with viewID of " + Bytes.toStringBinary(viewId));
+ } else {
+ indexTableNames.add(indexTableName);
+ }
}
} catch (ClassNotFoundException e) {
throw new IOException(e);
[3/3] phoenix git commit: PHOENIX-4182 DatabaseMetaData.getTables
throws exception when getting SEQUENCE information
Posted by ja...@apache.org.
PHOENIX-4182 DatabaseMetaData.getTables throws exception when getting SEQUENCE information
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/2b78e48f
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/2b78e48f
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/2b78e48f
Branch: refs/heads/4.x-HBase-1.1
Commit: 2b78e48f41f82971af5a8934073b111eb7dde1d4
Parents: 1c4e09f
Author: James Taylor <jt...@salesforce.com>
Authored: Mon Sep 11 13:06:17 2017 -0700
Committer: James Taylor <jt...@salesforce.com>
Committed: Mon Sep 11 14:49:57 2017 -0700
----------------------------------------------------------------------
.../phoenix/end2end/QueryDatabaseMetaDataIT.java | 13 +++++++++++++
.../apache/phoenix/jdbc/PhoenixDatabaseMetaData.java | 14 ++++++++------
2 files changed, 21 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/2b78e48f/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java
index 44012b9..12c0bd3 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java
@@ -275,6 +275,19 @@ public class QueryDatabaseMetaDataIT extends BaseClientManagedTimeIT {
assertEquals("BAS", rs.getString("TABLE_NAME"));
assertEquals(PTableType.TABLE.toString(), rs.getString("TABLE_TYPE"));
assertFalse(rs.next());
+
+ rs = dbmd.getTables(null, "B", null, new String[] {PhoenixDatabaseMetaData.SEQUENCE_TABLE_TYPE});
+ assertTrue(rs.next());
+ assertNull(rs.getString("TABLE_CAT"));
+ assertEquals("B", rs.getString("TABLE_SCHEM"));
+ assertEquals("S1", rs.getString("TABLE_NAME"));
+ assertEquals(PhoenixDatabaseMetaData.SEQUENCE_TABLE_TYPE, rs.getString("TABLE_TYPE"));
+ assertTrue(rs.next());
+ assertNull(rs.getString("TABLE_CAT"));
+ assertEquals("B", rs.getString("TABLE_SCHEM"));
+ assertEquals("S3", rs.getString("TABLE_NAME"));
+ assertEquals(PhoenixDatabaseMetaData.SEQUENCE_TABLE_TYPE, rs.getString("TABLE_TYPE"));
+ assertFalse(rs.next());
}
@Test
http://git-wip-us.apache.org/repos/asf/phoenix/blob/2b78e48f/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixDatabaseMetaData.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixDatabaseMetaData.java b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixDatabaseMetaData.java
index 24bfde7..ac7f3ef 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixDatabaseMetaData.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixDatabaseMetaData.java
@@ -1031,10 +1031,10 @@ public class PhoenixDatabaseMetaData implements DatabaseMetaData {
public Integer getScale() {
return null;
}
- @Override
- public SortOrder getSortOrder() {
- return SortOrder.getDefault();
- }
+ @Override
+ public SortOrder getSortOrder() {
+ return SortOrder.getDefault();
+ }
};
private static final RowProjector TABLE_TYPE_ROW_PROJECTOR = new RowProjector(Arrays.<ColumnProjector>asList(
new ExpressionProjector(TABLE_TYPE, SYSTEM_CATALOG,
@@ -1160,10 +1160,12 @@ public class PhoenixDatabaseMetaData implements DatabaseMetaData {
StringBuilder whereClause = new StringBuilder();
addTenantIdFilter(whereClause, catalog);
if (schemaPattern != null) {
- whereClause.append(" and " + SEQUENCE_SCHEMA + (schemaPattern.length() == 0 ? " is null" : " like '" + StringUtil.escapeStringConstant(schemaPattern) + "'\n" ));
+ appendConjunction(whereClause);
+ whereClause.append(SEQUENCE_SCHEMA + (schemaPattern.length() == 0 ? " is null" : " like '" + StringUtil.escapeStringConstant(schemaPattern) + "'\n" ));
}
if (tableNamePattern != null) {
- whereClause.append(" and " + SEQUENCE_NAME + " like '" + StringUtil.escapeStringConstant(tableNamePattern) + "'\n" );
+ appendConjunction(whereClause);
+ whereClause.append(SEQUENCE_NAME + " like '" + StringUtil.escapeStringConstant(tableNamePattern) + "'\n" );
}
if (whereClause.length() > 0) {
buf.append(" where\n");