Merge remote-tracking branch 'origin/snappy/master' into SNAP-713

Conflicts: tests/sql/src/main/java/sql/dmlStatements/TradeBuyOrdersDMLStmt.java
TIBCOSoftware · Jul 15, 2019 · 7f41f49 · 7f41f49
2 parents 306c511 + ff41c6d
commit 7f41f49
Show file tree

Hide file tree

Showing 80 changed files with 1,818 additions and 687 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 SnappyData, Inc. All rights reserved.
+ * Copyright (c) 2017-2019 TIBCO Software Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you
  * may not use this file except in compliance with the License. You
@@ -118,7 +118,7 @@ allprojects {
     snappyDunitVersion = '1.0.3.6'
 
     // product and release properties
-    PRODUCT_NAME = 'SnappyData RowStore'
+    PRODUCT_NAME = 'TIBCO ComputeDB RowStore'
 
     GEMFIRE_PRODUCT = 'Pivotal GemFire'
     GEMFIRE_VERSION = '7.5.Beta'
@@ -130,13 +130,13 @@ allprojects {
 
     PRODUCT_MAJOR = '1'
     PRODUCT_MINOR = '6'
-    PRODUCT_MAINT = '2'
-    PRODUCT_CLASSIFIER = '.1'
+    PRODUCT_MAINT = '3'
+    PRODUCT_CLASSIFIER = ''
     PRODUCT_RELEASE_STAGE = ''
     PRODUCT_VERSION = "${PRODUCT_MAJOR}.${PRODUCT_MINOR}.${PRODUCT_MAINT}${PRODUCT_CLASSIFIER}"
-    vendorName = 'SnappyData, Inc.'
+    vendorName = 'TIBCO Software Inc.'
     PRODUCT_VENDOR = vendorName
-    COPYRIGHT = "Copyright 2017, ${PRODUCT_VENDOR} All rights reserved."
+    COPYRIGHT = "Copyright (c) 2017-2019, ${PRODUCT_VENDOR} All rights reserved."
 
     if (rootProject.name == 'snappy-store') {
       subprojectBase = ':'
@@ -539,7 +539,7 @@ subprojects {
             name PRODUCT_NAME
             packaging 'jar'
             // optionally artifactId can be defined here
-            description 'SnappyData store based off Pivotal GemFireXD'
+            description 'TIBCO ComputeDB store based off Pivotal GemFireXD'
             url 'http://www.snappydata.io'
 
             scm {
@@ -559,7 +559,7 @@ subprojects {
               developer {
                 id 'smenon'
                 name 'Sudhir Menon'
-                email '[email protected]'
+                email '[email protected]'
               }
             }
           }
@@ -587,8 +587,7 @@ gradle.taskGraph.whenReady { graph ->
       def test = (Test)task
       test.configure {
 
-        jvmArgs = ['-XX:+HeapDumpOnOutOfMemoryError',
-                   '-XX:+UseParNewGC', '-XX:+UseConcMarkSweepGC',
+        jvmArgs = ['-XX:+UseParNewGC', '-XX:+UseConcMarkSweepGC',
                    '-XX:CMSInitiatingOccupancyFraction=50',
                    '-XX:+CMSClassUnloadingEnabled', '-ea']
 
@@ -615,30 +614,30 @@ gradle.taskGraph.whenReady { graph ->
         environment 'GEMFIREXD'                           : productDir.getAbsolutePath(),
                     'JUNIT_JAR'                           : project.sourceSets.test.java.outputDir
 
-        int numTestClasses = 0
-        def testCount = new java.util.concurrent.atomic.AtomicInteger(0)
-
-        doFirst {
-          numTestClasses = test.getCandidateClassFiles().getFiles().size()
-        }
-        beforeSuite { desc ->
-          if (desc.className != null) {
-            def count = testCount.incrementAndGet()
-            println "${now()} Start ${desc.className} ($count/$numTestClasses)"
-          }
-        }
-        afterSuite { desc, result ->
-          if (desc.className != null) {
-            println "${now()} END ${desc.className}"
-          }
-        }
-
         if (rootProject.name == 'snappy-store') {
           def failureCount = new java.util.concurrent.atomic.AtomicInteger(0)
           def progress = new File(workingDir, 'progress.txt')
           def output = new File(workingDir, 'output.txt')
 
           def eol = System.getProperty('line.separator')
+
+          int numTestClasses = 0
+          def testCount = new java.util.concurrent.atomic.AtomicInteger(0)
+          doFirst {
+            numTestClasses = test.getCandidateClassFiles().getFiles().size()
+          }
+          beforeSuite { desc ->
+            if (desc.className != null) {
+              def count = testCount.incrementAndGet()
+              println "${now()} Start ${desc.className} ($count/$numTestClasses)"
+            }
+          }
+          afterSuite { desc, result ->
+            if (desc.className != null) {
+              println "${now()} END ${desc.className}"
+            }
+          }
+
           beforeTest { desc ->
             String now = now()
             progress << "${now} Starting test ${desc.className} ${desc.name}${eol}"

diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/LowMemoryException.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/LowMemoryException.java
@@ -58,6 +58,16 @@ public LowMemoryException(String msg, final Set<DistributedMember> criticalMembe
     CallbackFactoryProvider.getStoreCallbacks().logMemoryStats();
   }
 
+  /**
+   * Constructs an instance of <code>LowMemoryException</code> with the specified cause.
+   * @param cause
+   */
+  public LowMemoryException(Throwable cause) {
+    super(cause);
+    this.critMems = Collections.emptySet();
+    CallbackFactoryProvider.getStoreCallbacks().logMemoryStats();
+  }
+
   /**
    * Get a read-only set of members in a critical state at the time this
    * exception was constructed.

diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java
@@ -2328,7 +2328,7 @@ public interface DistributionConfig extends Config, ManagerLogWriter.LogConfig {
   public static final String DISABLE_AUTO_RECONNECT_NAME = "disable-auto-reconnect";
 
   /** The default value of the corresponding property */
-  public static final boolean DEFAULT_DISABLE_AUTO_RECONNECT = false;
+  public static final boolean DEFAULT_DISABLE_AUTO_RECONNECT = true;
 
   /**
    * Gets the value of <a href="../DistributedSystem.html#disable-auto-reconnect">"disable-auto-reconnect"</a>