[01/11] phoenix git commit: PHOENIX-4773 Move HTable rollback wrapper into Tephra TAL method [Forced Update!]
Repository: phoenix
Updated Branches:
refs/heads/4.x-cdh5.14 3c72eef25 -> 3842ff87b (forced update)
PHOENIX-4773 Move HTable rollback wrapper into Tephra TAL method
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/3aaff768
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/3aaff768
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/3aaff768
Branch: refs/heads/4.x-cdh5.14
Commit: 3aaff7682fe8609d9c6a165ef778dd7a13076a7c
Parents: 0a06e59
Author: James Taylor
Authored: Mon Jun 4 20:27:36 2018 -0700
Committer: James Taylor
Committed: Tue Jun 5 21:55:16 2018 -0700
--
.../apache/phoenix/cache/ServerCacheClient.java | 21 +-
.../apache/phoenix/execute/HashJoinPlan.java| 7 +-
.../apache/phoenix/execute/MutationState.java | 190 ++-
.../PhoenixTxIndexMutationGenerator.java| 42
.../phoenix/index/IndexMetaDataCacheClient.java | 67 ++-
.../apache/phoenix/join/HashCacheClient.java| 5 +-
.../transaction/OmidTransactionContext.java | 3 +-
.../transaction/PhoenixTransactionContext.java | 5 +-
.../transaction/TephraTransactionContext.java | 91 -
.../java/org/apache/phoenix/util/IndexUtil.java | 8 +
10 files changed, 230 insertions(+), 209 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/phoenix/blob/3aaff768/phoenix-core/src/main/java/org/apache/phoenix/cache/ServerCacheClient.java
--
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/cache/ServerCacheClient.java
b/phoenix-core/src/main/java/org/apache/phoenix/cache/ServerCacheClient.java
index 68de747..5e284bd 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/cache/ServerCacheClient.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/cache/ServerCacheClient.java
@@ -70,7 +70,6 @@ import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.query.QueryServicesOptions;
import org.apache.phoenix.schema.PTable;
import org.apache.phoenix.schema.PTable.IndexType;
-import org.apache.phoenix.schema.TableRef;
import org.apache.phoenix.util.Closeables;
import org.apache.phoenix.util.SQLCloseable;
import org.apache.phoenix.util.SQLCloseables;
@@ -90,7 +89,7 @@ public class ServerCacheClient {
private static final Random RANDOM = new Random();
public static final String HASH_JOIN_SERVER_CACHE_RESEND_PER_SERVER =
"hash.join.server.cache.resend.per.server";
private final PhoenixConnection connection;
-private final Map cacheUsingTableRefMap = new
ConcurrentHashMap();
+private final Map cacheUsingTableMap = new
ConcurrentHashMap();
/**
* Construct client used to create a serialized cached snapshot of a table
and send it to each region server
@@ -220,12 +219,12 @@ public class ServerCacheClient {
}
public ServerCache addServerCache(ScanRanges keyRanges, final
ImmutableBytesWritable cachePtr, final byte[] txState,
-final ServerCacheFactory cacheFactory, final TableRef
cacheUsingTableRef) throws SQLException {
-return addServerCache(keyRanges, cachePtr, txState, cacheFactory,
cacheUsingTableRef, false);
+final ServerCacheFactory cacheFactory, final PTable
cacheUsingTable) throws SQLException {
+return addServerCache(keyRanges, cachePtr, txState, cacheFactory,
cacheUsingTable, false);
}
public ServerCache addServerCache(ScanRanges keyRanges, final
ImmutableBytesWritable cachePtr, final byte[] txState,
-final ServerCacheFactory cacheFactory, final TableRef
cacheUsingTableRef, boolean storeCacheOnClient)
+final ServerCacheFactory cacheFactory, final PTable
cacheUsingTable, boolean storeCacheOnClient)
throws SQLException {
ConnectionQueryServices services = connection.getQueryServices();
List closeables = new ArrayList();
@@ -241,7 +240,6 @@ public class ServerCacheClient {
ExecutorService executor = services.getExecutor();
List> futures = Collections.emptyList();
try {
-final PTable cacheUsingTable = cacheUsingTableRef.getTable();
List locations =
services.getAllTableRegions(cacheUsingTable.getPhysicalName().getBytes());
int nRegions = locations.size();
// Size these based on worst case
@@ -258,7 +256,7 @@ public class ServerCacheClient {
servers.add(entry);
if (LOG.isDebugEnabled())
{LOG.debug(addCustomAnnotations("Adding cache entry to be sent for " + entry,
connection));}
final byte[] key =
getKeyInRegion(entry.getRegionInfo().getStartKey());
-final HTableInterface htable =
[01/11] phoenix git commit: PHOENIX-4773 Move HTable rollback wrapper into Tephra TAL method [Forced Update!]
Repository: phoenix
Updated Branches:
refs/heads/4.x-cdh5.13 b68b9e34c -> 97ca58c20 (forced update)
PHOENIX-4773 Move HTable rollback wrapper into Tephra TAL method
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/3aaff768
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/3aaff768
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/3aaff768
Branch: refs/heads/4.x-cdh5.13
Commit: 3aaff7682fe8609d9c6a165ef778dd7a13076a7c
Parents: 0a06e59
Author: James Taylor
Authored: Mon Jun 4 20:27:36 2018 -0700
Committer: James Taylor
Committed: Tue Jun 5 21:55:16 2018 -0700
--
.../apache/phoenix/cache/ServerCacheClient.java | 21 +-
.../apache/phoenix/execute/HashJoinPlan.java| 7 +-
.../apache/phoenix/execute/MutationState.java | 190 ++-
.../PhoenixTxIndexMutationGenerator.java| 42
.../phoenix/index/IndexMetaDataCacheClient.java | 67 ++-
.../apache/phoenix/join/HashCacheClient.java| 5 +-
.../transaction/OmidTransactionContext.java | 3 +-
.../transaction/PhoenixTransactionContext.java | 5 +-
.../transaction/TephraTransactionContext.java | 91 -
.../java/org/apache/phoenix/util/IndexUtil.java | 8 +
10 files changed, 230 insertions(+), 209 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/phoenix/blob/3aaff768/phoenix-core/src/main/java/org/apache/phoenix/cache/ServerCacheClient.java
--
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/cache/ServerCacheClient.java
b/phoenix-core/src/main/java/org/apache/phoenix/cache/ServerCacheClient.java
index 68de747..5e284bd 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/cache/ServerCacheClient.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/cache/ServerCacheClient.java
@@ -70,7 +70,6 @@ import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.query.QueryServicesOptions;
import org.apache.phoenix.schema.PTable;
import org.apache.phoenix.schema.PTable.IndexType;
-import org.apache.phoenix.schema.TableRef;
import org.apache.phoenix.util.Closeables;
import org.apache.phoenix.util.SQLCloseable;
import org.apache.phoenix.util.SQLCloseables;
@@ -90,7 +89,7 @@ public class ServerCacheClient {
private static final Random RANDOM = new Random();
public static final String HASH_JOIN_SERVER_CACHE_RESEND_PER_SERVER =
"hash.join.server.cache.resend.per.server";
private final PhoenixConnection connection;
-private final Map cacheUsingTableRefMap = new
ConcurrentHashMap();
+private final Map cacheUsingTableMap = new
ConcurrentHashMap();
/**
* Construct client used to create a serialized cached snapshot of a table
and send it to each region server
@@ -220,12 +219,12 @@ public class ServerCacheClient {
}
public ServerCache addServerCache(ScanRanges keyRanges, final
ImmutableBytesWritable cachePtr, final byte[] txState,
-final ServerCacheFactory cacheFactory, final TableRef
cacheUsingTableRef) throws SQLException {
-return addServerCache(keyRanges, cachePtr, txState, cacheFactory,
cacheUsingTableRef, false);
+final ServerCacheFactory cacheFactory, final PTable
cacheUsingTable) throws SQLException {
+return addServerCache(keyRanges, cachePtr, txState, cacheFactory,
cacheUsingTable, false);
}
public ServerCache addServerCache(ScanRanges keyRanges, final
ImmutableBytesWritable cachePtr, final byte[] txState,
-final ServerCacheFactory cacheFactory, final TableRef
cacheUsingTableRef, boolean storeCacheOnClient)
+final ServerCacheFactory cacheFactory, final PTable
cacheUsingTable, boolean storeCacheOnClient)
throws SQLException {
ConnectionQueryServices services = connection.getQueryServices();
List closeables = new ArrayList();
@@ -241,7 +240,6 @@ public class ServerCacheClient {
ExecutorService executor = services.getExecutor();
List> futures = Collections.emptyList();
try {
-final PTable cacheUsingTable = cacheUsingTableRef.getTable();
List locations =
services.getAllTableRegions(cacheUsingTable.getPhysicalName().getBytes());
int nRegions = locations.size();
// Size these based on worst case
@@ -258,7 +256,7 @@ public class ServerCacheClient {
servers.add(entry);
if (LOG.isDebugEnabled())
{LOG.debug(addCustomAnnotations("Adding cache entry to be sent for " + entry,
connection));}
final byte[] key =
getKeyInRegion(entry.getRegionInfo().getStartKey());
-final HTableInterface htable =
[01/11] phoenix git commit: PHOENIX-4773 Move HTable rollback wrapper into Tephra TAL method [Forced Update!]
Repository: phoenix
Updated Branches:
refs/heads/4.x-cdh5.12 44939d29e -> d32eac94d (forced update)
PHOENIX-4773 Move HTable rollback wrapper into Tephra TAL method
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/3aaff768
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/3aaff768
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/3aaff768
Branch: refs/heads/4.x-cdh5.12
Commit: 3aaff7682fe8609d9c6a165ef778dd7a13076a7c
Parents: 0a06e59
Author: James Taylor
Authored: Mon Jun 4 20:27:36 2018 -0700
Committer: James Taylor
Committed: Tue Jun 5 21:55:16 2018 -0700
--
.../apache/phoenix/cache/ServerCacheClient.java | 21 +-
.../apache/phoenix/execute/HashJoinPlan.java| 7 +-
.../apache/phoenix/execute/MutationState.java | 190 ++-
.../PhoenixTxIndexMutationGenerator.java| 42
.../phoenix/index/IndexMetaDataCacheClient.java | 67 ++-
.../apache/phoenix/join/HashCacheClient.java| 5 +-
.../transaction/OmidTransactionContext.java | 3 +-
.../transaction/PhoenixTransactionContext.java | 5 +-
.../transaction/TephraTransactionContext.java | 91 -
.../java/org/apache/phoenix/util/IndexUtil.java | 8 +
10 files changed, 230 insertions(+), 209 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/phoenix/blob/3aaff768/phoenix-core/src/main/java/org/apache/phoenix/cache/ServerCacheClient.java
--
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/cache/ServerCacheClient.java
b/phoenix-core/src/main/java/org/apache/phoenix/cache/ServerCacheClient.java
index 68de747..5e284bd 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/cache/ServerCacheClient.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/cache/ServerCacheClient.java
@@ -70,7 +70,6 @@ import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.query.QueryServicesOptions;
import org.apache.phoenix.schema.PTable;
import org.apache.phoenix.schema.PTable.IndexType;
-import org.apache.phoenix.schema.TableRef;
import org.apache.phoenix.util.Closeables;
import org.apache.phoenix.util.SQLCloseable;
import org.apache.phoenix.util.SQLCloseables;
@@ -90,7 +89,7 @@ public class ServerCacheClient {
private static final Random RANDOM = new Random();
public static final String HASH_JOIN_SERVER_CACHE_RESEND_PER_SERVER =
"hash.join.server.cache.resend.per.server";
private final PhoenixConnection connection;
-private final Map cacheUsingTableRefMap = new
ConcurrentHashMap();
+private final Map cacheUsingTableMap = new
ConcurrentHashMap();
/**
* Construct client used to create a serialized cached snapshot of a table
and send it to each region server
@@ -220,12 +219,12 @@ public class ServerCacheClient {
}
public ServerCache addServerCache(ScanRanges keyRanges, final
ImmutableBytesWritable cachePtr, final byte[] txState,
-final ServerCacheFactory cacheFactory, final TableRef
cacheUsingTableRef) throws SQLException {
-return addServerCache(keyRanges, cachePtr, txState, cacheFactory,
cacheUsingTableRef, false);
+final ServerCacheFactory cacheFactory, final PTable
cacheUsingTable) throws SQLException {
+return addServerCache(keyRanges, cachePtr, txState, cacheFactory,
cacheUsingTable, false);
}
public ServerCache addServerCache(ScanRanges keyRanges, final
ImmutableBytesWritable cachePtr, final byte[] txState,
-final ServerCacheFactory cacheFactory, final TableRef
cacheUsingTableRef, boolean storeCacheOnClient)
+final ServerCacheFactory cacheFactory, final PTable
cacheUsingTable, boolean storeCacheOnClient)
throws SQLException {
ConnectionQueryServices services = connection.getQueryServices();
List closeables = new ArrayList();
@@ -241,7 +240,6 @@ public class ServerCacheClient {
ExecutorService executor = services.getExecutor();
List> futures = Collections.emptyList();
try {
-final PTable cacheUsingTable = cacheUsingTableRef.getTable();
List locations =
services.getAllTableRegions(cacheUsingTable.getPhysicalName().getBytes());
int nRegions = locations.size();
// Size these based on worst case
@@ -258,7 +256,7 @@ public class ServerCacheClient {
servers.add(entry);
if (LOG.isDebugEnabled())
{LOG.debug(addCustomAnnotations("Adding cache entry to be sent for " + entry,
connection));}
final byte[] key =
getKeyInRegion(entry.getRegionInfo().getStartKey());
-final HTableInterface htable =
