geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bschucha...@apache.org
Subject [26/26] incubator-geode git commit: Merge remote-tracking branch 'origin/develop' into feature/GEODE-77
Date Thu, 01 Oct 2015 17:59:07 GMT
Merge remote-tracking branch 'origin/develop' into feature/GEODE-77


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/d624ea73
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/d624ea73
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/d624ea73

Branch: refs/heads/feature/GEODE-77
Commit: d624ea73d0b12b7e21ddbd5e72ed3ca07bc0c71c
Parents: e3e794d e1c2d8e
Author: Bruce Schuchardt <bschuchardt@pivotal.io>
Authored: Thu Oct 1 10:32:51 2015 -0700
Committer: Bruce Schuchardt <bschuchardt@pivotal.io>
Committed: Thu Oct 1 10:32:51 2015 -0700

----------------------------------------------------------------------
 .../src/test/java/AgentUtilJUnitTest.java       | 109 ---------
 .../management/internal/AgentUtilJUnitTest.java | 106 ++++++++
 .../gemstone/gemfire/cache/EvictionAction.java  |   3 +-
 .../gemfire/cache/EvictionAlgorithm.java        |   3 +-
 .../index/FunctionalIndexCreationHelper.java    |   1 -
 .../query/internal/index/PartitionedIndex.java  |  16 +-
 .../gemstone/gemfire/internal/SocketCloser.java | 241 +++++++++++++++++++
 .../gemfire/internal/SocketCreator.java         |  98 --------
 .../gemfire/internal/cache/TXCommitMessage.java |  29 +--
 .../gemfire/internal/cache/TXEntryState.java    |  19 +-
 .../cache/tier/sockets/CacheClientNotifier.java |  10 +
 .../cache/tier/sockets/CacheClientProxy.java    |  32 ++-
 .../wan/serial/SerialGatewaySenderQueue.java    |   2 +
 .../offheap/SimpleMemoryAllocatorImpl.java      |   8 +-
 .../gemstone/gemfire/internal/redis/Coder.java  | 194 ++++++++-------
 .../gemfire/internal/redis/RegionProvider.java  |  44 ++--
 .../gemfire/internal/tcp/Connection.java        | 130 ++++++----
 .../gemfire/internal/tcp/ConnectionTable.java   |  95 +++++++-
 .../internal/beans/CacheServerBridge.java       |   2 +
 .../cli/functions/CreateHDFSStoreFunction.java  |   4 +-
 .../gemfire/pdx/internal/TypeRegistry.java      |  15 +-
 .../gemfire/cache/Bug52289JUnitTest.java        |  81 +++++++
 .../internal/RegionWithHDFSBasicDUnitTest.java  |   4 +-
 .../hdfs/internal/RegionWithHDFSTestBase.java   |   4 +-
 .../query/internal/index/IndexUseJUnitTest.java |  52 ++++
 .../cache30/BridgeMembershipDUnitTest.java      |  38 +--
 .../gemstone/gemfire/cache30/CacheTestCase.java |  27 +--
 .../gemfire/cache30/RegionTestCase.java         |   1 +
 .../gemfire/internal/SocketCloserJUnitTest.java | 180 ++++++++++++++
 .../internal/SocketCloserWithWaitJUnitTest.java |  22 ++
 .../cache/ClientServerTransactionDUnitTest.java | 151 ++++++++++--
 .../cache/ConcurrentMapOpsDUnitTest.java        |  69 +++++-
 .../offheap/OffHeapValidationJUnitTest.java     |  45 +++-
 .../test/java/dunit/DistributedTestCase.java    |  59 +++++
 .../cache/util/AutoBalancerJUnitTest.java       |  55 +----
 35 files changed, 1393 insertions(+), 556 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d624ea73/gemfire-core/src/main/java/com/gemstone/gemfire/internal/SocketCreator.java
----------------------------------------------------------------------
diff --cc gemfire-core/src/main/java/com/gemstone/gemfire/internal/SocketCreator.java
index 55a0b53,940936f..32aa1c6
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/SocketCreator.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/SocketCreator.java
@@@ -75,9 -75,9 +75,8 @@@ import com.gemstone.gemfire.internal.ca
  import com.gemstone.gemfire.internal.cache.wan.TransportFilterSocketFactory;
  import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
  import com.gemstone.gemfire.internal.logging.LogService;
- import com.gemstone.gemfire.internal.logging.LoggingThreadGroup;
  import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
  import com.gemstone.gemfire.internal.util.PasswordUtil;
 -import com.gemstone.org.jgroups.util.ConnectionWatcher;
  
  import java.util.*;
  

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d624ea73/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientNotifier.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d624ea73/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientProxy.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d624ea73/gemfire-core/src/main/java/com/gemstone/gemfire/internal/redis/RegionProvider.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d624ea73/gemfire-core/src/main/java/com/gemstone/gemfire/internal/tcp/Connection.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d624ea73/gemfire-core/src/main/java/com/gemstone/gemfire/internal/tcp/ConnectionTable.java
----------------------------------------------------------------------
diff --cc gemfire-core/src/main/java/com/gemstone/gemfire/internal/tcp/ConnectionTable.java
index 384ee94,508eba2..387b737
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/tcp/ConnectionTable.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/tcp/ConnectionTable.java
@@@ -31,8 -38,9 +38,9 @@@ import com.gemstone.gemfire.distributed
  import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
  import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
  import com.gemstone.gemfire.distributed.internal.membership.MembershipManager;
 -import com.gemstone.gemfire.distributed.internal.membership.jgroup.JGroupMembershipManager;
 +import com.gemstone.gemfire.distributed.internal.membership.gms.mgr.GMSMembershipManager;
  import com.gemstone.gemfire.internal.Assert;
+ import com.gemstone.gemfire.internal.SocketCloser;
  import com.gemstone.gemfire.internal.SocketCreator;
  import com.gemstone.gemfire.internal.SystemTimer;
  import com.gemstone.gemfire.internal.i18n.LocalizedStrings;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d624ea73/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/BridgeMembershipDUnitTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d624ea73/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheTestCase.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d624ea73/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerTransactionDUnitTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d624ea73/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ConcurrentMapOpsDUnitTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d624ea73/gemfire-core/src/test/java/dunit/DistributedTestCase.java
----------------------------------------------------------------------
diff --cc gemfire-core/src/test/java/dunit/DistributedTestCase.java
index 2e6346d,c78510a..41d7068
--- a/gemfire-core/src/test/java/dunit/DistributedTestCase.java
+++ b/gemfire-core/src/test/java/dunit/DistributedTestCase.java
@@@ -737,8 -802,11 +760,9 @@@ public abstract class DistributedTestCa
      InternalBridgeMembership.unregisterAllListeners();
      ClientStatsManager.cleanupForTests();
      unregisterInstantiatorsInThisVM();
 -    GemFireTracer.DEBUG = Boolean.getBoolean("DistributionManager.DEBUG_JAVAGROUPS");
 -    Protocol.trace = GemFireTracer.DEBUG;
      DistributionMessageObserver.setInstance(null);
      QueryObserverHolder.reset();
+     DiskStoreObserver.setInstance(null);
      if (InternalDistributedSystem.systemAttemptingReconnect != null) {
        InternalDistributedSystem.systemAttemptingReconnect.stopReconnecting();
      }


Mime
View raw message