You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by td...@apache.org on 2015/08/18 22:54:27 UTC
phoenix git commit: PHOENIX-1946 Allow index without WAL codec if
table is transactional
Repository: phoenix
Updated Branches:
refs/heads/txn a11f48300 -> 81e52e85b
PHOENIX-1946 Allow index without WAL codec if table is transactional
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/81e52e85
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/81e52e85
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/81e52e85
Branch: refs/heads/txn
Commit: 81e52e85b8591f6bb7f5d98b981b5d25e005d920
Parents: a11f483
Author: Thomas D'Silva <td...@salesforce.com>
Authored: Tue Aug 18 13:51:36 2015 -0700
Committer: Thomas D'Silva <td...@salesforce.com>
Committed: Tue Aug 18 13:51:36 2015 -0700
----------------------------------------------------------------------
.../src/main/java/org/apache/phoenix/schema/MetaDataClient.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/81e52e85/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java b/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
index a224ee7..1608548 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
@@ -957,7 +957,7 @@ public class MetaDataClient {
if (hbaseVersion < PhoenixDatabaseMetaData.MUTABLE_SI_VERSION_THRESHOLD) {
throw new SQLExceptionInfo.Builder(SQLExceptionCode.NO_MUTABLE_INDEXES).setTableName(indexTableName.getTableName()).build().buildException();
}
- if (connection.getQueryServices().hasInvalidIndexConfiguration()) {
+ if (connection.getQueryServices().hasInvalidIndexConfiguration() && !dataTable.isTransactional()) {
throw new SQLExceptionInfo.Builder(SQLExceptionCode.INVALID_MUTABLE_INDEX_CONFIG).setTableName(indexTableName.getTableName()).build().buildException();
}
}
@@ -2247,7 +2247,7 @@ public class MetaDataClient {
if (hbaseVersion < PhoenixDatabaseMetaData.MUTABLE_SI_VERSION_THRESHOLD) {
throw new SQLExceptionInfo.Builder(SQLExceptionCode.NO_MUTABLE_INDEXES).setSchemaName(schemaName).setTableName(tableName).build().buildException();
}
- if (connection.getQueryServices().hasInvalidIndexConfiguration()) {
+ if (connection.getQueryServices().hasInvalidIndexConfiguration() && !table.isTransactional()) {
throw new SQLExceptionInfo.Builder(SQLExceptionCode.INVALID_MUTABLE_INDEX_CONFIG).setSchemaName(schemaName).setTableName(tableName).build().buildException();
}
}