[geode] branch develop updated: GEODE-5003: Add tests for CompositeResultData (#1743)
This is an automated email from the ASF dual-hosted git repository.
jensdeppe pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new f13f56c GEODE-5003: Add tests for CompositeResultData (#1743)
f13f56c is described below
commit f13f56c7e0c28cdd15da56a001a1fe9d20bd0b09
Author: Jens Deppe
AuthorDate: Fri Apr 6 06:42:14 2018 -0700
GEODE-5003: Add tests for CompositeResultData (#1743)
---
.../cli/result/CompositeResultDataTest.java| 132 +
1 file changed, 132 insertions(+)
diff --git
a/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/CompositeResultDataTest.java
b/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/CompositeResultDataTest.java
new file mode 100644
index 000..d5c33fe
--- /dev/null
+++
b/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/CompositeResultDataTest.java
@@ -0,0 +1,132 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
contributor license
+ * agreements. See the NOTICE file distributed with this work for additional
information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache
License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express
+ * or implied. See the License for the specific language governing permissions
and limitations under
+ * the License.
+ */
+
+package org.apache.geode.management.internal.cli.result;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import org.apache.geode.management.internal.cli.json.GfJsonObject;
+import org.apache.geode.test.junit.categories.UnitTest;
+
+@Category(UnitTest.class)
+public class CompositeResultDataTest {
+
+ @Test
+ public void emptySection() {
+CompositeResultData result = new CompositeResultData();
+result.addSection();
+
+GfJsonObject json = result.getGfJsonObject();
+
assertThat(json.getJSONObject("content").getString("__sections__-0")).isEqualTo("{}");
+ }
+
+ @Test
+ public void justAHeader() {
+CompositeResultData result = new CompositeResultData();
+String header = "this space left blank";
+result.setHeader(header);
+
+GfJsonObject json = result.getGfJsonObject();
+assertThat(json.getString("header")).isEqualTo(header);
+assertThat(json.getString("content")).isEqualTo("{}");
+ }
+
+ @Test
+ public void justAFooter() {
+CompositeResultData result = new CompositeResultData();
+String footer = "this space left blank";
+result.setFooter(footer);
+
+GfJsonObject json = result.getGfJsonObject();
+assertThat(json.getString("footer")).isEqualTo(footer);
+assertThat(json.getString("content")).isEqualTo("{}");
+ }
+
+ @Test
+ public void withSection_andHeader_andFooter() {
+CompositeResultData result = new CompositeResultData();
+String header = "this header left blank";
+String footer = "this footer left blank";
+
+result.addSection();
+result.setHeader(header);
+result.setFooter(footer);
+
+GfJsonObject json = result.getGfJsonObject();
+
assertThat(json.getJSONObject("content").getString("__sections__-0")).isEqualTo("{}");
+assertThat(json.getString("footer")).isEqualTo(footer);
+assertThat(json.getString("header")).isEqualTo(header);
+ }
+
+ @Test
+ public void withNestedSectionContainingASingleTable() {
+CompositeResultData result = new CompositeResultData();
+String outerHeader = "this outerHeader left blank";
+String outerFooter = "this outerFooter left blank";
+
+result.setHeader(outerHeader);
+result.setFooter(outerFooter);
+CompositeResultData.SectionResultData section = result.addSection();
+
+String tableSurround = "this surround left blank";
+section.addTable();
+section.setHeader(tableSurround);
+section.setFooter(tableSurround);
+
+GfJsonObject json = result.getGfJsonObject();
+assertThat(json.getJSONObject("content").getJSONObject("__sections__-0")
+.getJSONObject("__tables__-0").getString("content")).isEqualTo("{}");
+assertThat(json.getString("footer")).isEqualTo(outerFooter);
+assertThat(json.getString("header")).isEqualTo(outerHeader);
+
assertThat(json.getJSONObject("content").getJSONObject("__sections__-0").getString("header"))
+.isEqualTo(tableSurround);
+
assertThat(json.getJSONObject("content").getJSONObject("__sections__-0").getString("footer"))
+.isEqualTo(tableSurround);
+
+
[geode] branch develop updated: GEODE-4830: modify the message when no jndi-binding is found. (#1732)
This is an automated email from the ASF dual-hosted git repository.
jinmeiliao pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new ced3d00 GEODE-4830: modify the message when no jndi-binding is found.
(#1732)
ced3d00 is described below
commit ced3d005e6a81cd72dd147abb885bb2bb88bfd03
Author: jinmeiliao
AuthorDate: Fri Apr 6 08:21:48 2018 -0700
GEODE-4830: modify the message when no jndi-binding is found. (#1732)
---
.../cli/commands/ListJndiBindingCommand.java | 19 --
.../cli/commands/ListJndiBindingCommandTest.java | 74 ++
2 files changed, 86 insertions(+), 7 deletions(-)
diff --git
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListJndiBindingCommand.java
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListJndiBindingCommand.java
index cc27b3e..9b352d7 100644
---
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListJndiBindingCommand.java
+++
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListJndiBindingCommand.java
@@ -58,14 +58,18 @@ public class ListJndiBindingCommand extends
InternalGfshCommand {
(InternalClusterConfigurationService) getConfigurationService();
if (ccService != null) {
configTable = resultSection.addTable();
- configTable.setHeader("Configured JNDI bindings: ");
// we don't support creating jndi binding with random group name yet
CacheConfig cacheConfig = ccService.getCacheConfig("cluster");
List jndiBindings =
cacheConfig.getJndiBindings();
- for (JndiBindingsType.JndiBinding jndiBinding : jndiBindings) {
-configTable.accumulate("Group Name", "cluster");
-configTable.accumulate("JNDI Name", jndiBinding.getJndiName());
-configTable.accumulate("JDBC Driver Class",
jndiBinding.getJdbcDriverClass());
+ if (jndiBindings.size() == 0) {
+configTable.setHeader("No JNDI-bindings found in cluster
configuration");
+ } else {
+configTable.setHeader("Configured JNDI bindings: ");
+for (JndiBindingsType.JndiBinding jndiBinding : jndiBindings) {
+ configTable.accumulate("Group Name", "cluster");
+ configTable.accumulate("JNDI Name", jndiBinding.getJndiName());
+ configTable.accumulate("JDBC Driver Class",
jndiBinding.getJdbcDriverClass());
+}
}
}
@@ -75,12 +79,14 @@ public class ListJndiBindingCommand extends
InternalGfshCommand {
if (configTable == null) {
return ResultBuilder.createUserErrorResult("No members found");
}
+ configTable.setFooter("No members found");
return ResultBuilder.buildResult(resultData);
}
memberTable = resultSection.addTable();
-memberTable.setHeader("Active JNDI bindings found on each member: ");
List rc =
executeAndGetFunctionResult(LIST_BINDING_FUNCTION, null, members);
+
+memberTable.setHeader("Active JNDI bindings found on each member: ");
for (CliFunctionResult oneResult : rc) {
Serializable[] serializables = oneResult.getSerializables();
for (int i = 0; i < serializables.length; i += 2) {
@@ -89,7 +95,6 @@ public class ListJndiBindingCommand extends
InternalGfshCommand {
memberTable.accumulate("JDBC Driver Class", serializables[i + 1]);
}
}
-
return ResultBuilder.buildResult(resultData);
}
}
diff --git
a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListJndiBindingCommandTest.java
b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListJndiBindingCommandTest.java
new file mode 100644
index 000..5fa36fc
--- /dev/null
+++
b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListJndiBindingCommandTest.java
@@ -0,0 +1,74 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.geode.management.internal.cli.commands;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mocki
[geode] branch develop updated: GEODE-5000: do not request/apply cluster config when creating client … (#1739)
This is an automated email from the ASF dual-hosted git repository.
jinmeiliao pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new 514b1d3 GEODE-5000: do not request/apply cluster config when creating
client … (#1739)
514b1d3 is described below
commit 514b1d3f074421041e593a02bbfae831ab320ea8
Author: jinmeiliao
AuthorDate: Fri Apr 6 08:23:08 2018 -0700
GEODE-5000: do not request/apply cluster config when creating client …
(#1739)
* do not request/apply cluster config when creating client cache.
* give client cache a no-op security service to avoid NPE.
---
.../internal/cache/ClusterConfigurationLoader.java | 2 +-
.../geode/internal/cache/GemFireCacheImpl.java | 41 ++
.../geode/internal/cache/GemFireCacheImplTest.java | 26 --
3 files changed, 51 insertions(+), 18 deletions(-)
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/ClusterConfigurationLoader.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/ClusterConfigurationLoader.java
index 0423964..1a18270 100644
---
a/geode-core/src/main/java/org/apache/geode/internal/cache/ClusterConfigurationLoader.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/cache/ClusterConfigurationLoader.java
@@ -83,7 +83,7 @@ public class ClusterConfigurationLoader {
*/
public void deployJarsReceivedFromClusterConfiguration(ConfigurationResponse
response)
throws IOException, ClassNotFoundException {
-logger.info("Requesting cluster configuration");
+logger.info("deploying jars received from cluster configuration");
if (response == null) {
return;
}
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
index bac76c8..9ec44f1 100755
---
a/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
@@ -848,16 +848,21 @@ public class GemFireCacheImpl implements InternalCache,
InternalClientCache, Has
this.system = system;
this.dm = this.system.getDistributionManager();
- this.configurationResponse = requestSharedConfiguration();
+ if (!isClient) {
+this.configurationResponse = requestSharedConfiguration();
- // apply the cluster's properties configuration and initialize security
using that
- // configuration
- ccLoader.applyClusterPropertiesConfiguration(this.configurationResponse,
- this.system.getConfig());
+// apply the cluster's properties configuration and initialize
security using that
+// configuration
+
ccLoader.applyClusterPropertiesConfiguration(this.configurationResponse,
+this.system.getConfig());
- this.securityService =
-
SecurityServiceFactory.create(this.system.getConfig().getSecurityProps(),
cacheConfig);
- this.system.setSecurityService(this.securityService);
+this.securityService =
+
SecurityServiceFactory.create(this.system.getConfig().getSecurityProps(),
cacheConfig);
+this.system.setSecurityService(this.securityService);
+ } else {
+// create a no-op security service for client
+this.securityService = SecurityServiceFactory.create();
+ }
if (!this.isClient && PoolManager.getAll().isEmpty()) {
// We only support management on members of a distributed system
@@ -1034,7 +1039,7 @@ public class GemFireCacheImpl implements InternalCache,
InternalClientCache, Has
* Request the shared configuration from the locator(s) which have the
Cluster config service
* running
*/
- private ConfigurationResponse requestSharedConfiguration() {
+ ConfigurationResponse requestSharedConfiguration() {
final DistributionConfig config = this.system.getConfig();
if (!(this.dm instanceof ClusterDistributionManager)) {
@@ -1216,12 +1221,9 @@ public class GemFireCacheImpl implements InternalCache,
InternalClientCache, Has
boolean completedCacheXml = false;
try {
- if (this.configurationResponse == null) {
-// Deploy all the jars from the deploy working dir.
-
ClassPathLoader.getLatest().getJarDeployer().loadPreviouslyDeployedJarsFromDisk();
+ if (!isClient) {
+applyJarAndXmlFromClusterConfig();
}
- ccLoader.applyClusterXmlConfiguration(this, this.configurationResponse,
- this.system.getConfig().getGroups());
initializeDeclarativeCache();
completedCacheXml = true;
} catch (RuntimeException e) {
@@ -1251,6 +1253,15 @@ public class GemFireCacheImpl implements InternalCache,
InternalClientCache, Has
this.isInitialized = true;
}
+ void applyJarAndXmlFromClusterConfig() {
+if (thi
[geode] branch develop updated: GEODE-4819: Separating authorization out from protobuf handlers
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git The following commit(s) were added to refs/heads/develop by this push: new 85c67b2 GEODE-4819: Separating authorization out from protobuf handlers 85c67b2 is described below commit 85c67b2294c7e24534e2a2b4c68fecef812b4199 Author: Bruce Schuchardt AuthorDate: Fri Apr 6 08:46:16 2018 -0700 GEODE-4819: Separating authorization out from protobuf handlers Removed unused imports that were causing compilation warnings --- .../protobuf/v1/authentication/AuthorizingFunctionServiceImplTest.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/authentication/AuthorizingFunctionServiceImplTest.java b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/authentication/AuthorizingFunctionServiceImplTest.java index 04feab8..0aff8f9 100644 --- a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/authentication/AuthorizingFunctionServiceImplTest.java +++ b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/authentication/AuthorizingFunctionServiceImplTest.java @@ -17,9 +17,7 @@ package org.apache.geode.internal.protocol.protobuf.v1.authentication; import static org.apache.geode.security.ResourcePermission.ALL; import static org.apache.geode.security.ResourcePermission.Operation.WRITE; import static org.apache.geode.security.ResourcePermission.Resource.CLUSTER; -import static org.apache.geode.security.ResourcePermission.Resource.DATA; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import static org.junit.Assert.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doThrow; @@ -29,7 +27,6 @@ import static org.mockito.Mockito.when; import java.util.Arrays; import java.util.Collections; -import com.sun.org.apache.regexp.internal.RE; import org.junit.After; import org.junit.Before; import org.junit.Test; -- To stop receiving notification emails like this one, please contact bschucha...@apache.org.
[geode] branch develop updated: GEODE-5005: Add unit tests for InfoResultData (#1745)
This is an automated email from the ASF dual-hosted git repository.
jensdeppe pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new 6f564c0 GEODE-5005: Add unit tests for InfoResultData (#1745)
6f564c0 is described below
commit 6f564c0509fbaf4f6aa8dd36adc776c6ac0b5060
Author: Jens Deppe
AuthorDate: Fri Apr 6 09:03:37 2018 -0700
GEODE-5005: Add unit tests for InfoResultData (#1745)
---
.../internal/cli/result/InfoResultDataTest.java| 63 ++
1 file changed, 63 insertions(+)
diff --git
a/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/InfoResultDataTest.java
b/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/InfoResultDataTest.java
new file mode 100644
index 000..a21a1a2
--- /dev/null
+++
b/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/InfoResultDataTest.java
@@ -0,0 +1,63 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
contributor license
+ * agreements. See the NOTICE file distributed with this work for additional
information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache
License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express
+ * or implied. See the License for the specific language governing permissions
and limitations under
+ * the License.
+ */
+
+package org.apache.geode.management.internal.cli.result;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import org.apache.geode.test.junit.categories.UnitTest;
+
+@Category(UnitTest.class)
+public class InfoResultDataTest {
+
+ @Test
+ public void emptyInfo() {
+InfoResultData result = new InfoResultData();
+assertThat(result.getGfJsonObject().getString("content")).isEqualTo("{}");
+ }
+
+ @Test
+ public void infoWithContent() {
+InfoResultData result = new InfoResultData("some content");
+
assertThat(result.getGfJsonObject().getJSONObject("content").getString("message"))
+.isEqualTo("[\"some content\"]");
+ }
+
+ @Test
+ public void infoWithMultipleContentLines() {
+InfoResultData result = new InfoResultData("some content");
+result.addLine("another line of content");
+
assertThat(result.getGfJsonObject().getJSONObject("content").getString("message"))
+.isEqualTo("[\"some content\",\"another line of content\"]");
+ }
+
+ @Test
+ public void infoWithFile() throws Exception {
+InfoResultData result = new InfoResultData("some content");
+ResultData data = result.addAsFile("content.zip", "file contents", "a
message", false);
+
+
assertThat(result.getGfJsonObject().getJSONObject("content").getJSONArray("__bytes__")
+.getJSONObject(0).getString("fileName")).isEqualTo("content.zip");
+
assertThat(result.getGfJsonObject().getJSONObject("content").getJSONArray("__bytes__")
+.getJSONObject(0).getString("fileType")).isEqualTo("1");
+
assertThat(result.getGfJsonObject().getJSONObject("content").getJSONArray("__bytes__")
+.getJSONObject(0).getString("fileMessage")).isEqualTo("a message");
+
assertThat(result.getGfJsonObject().getJSONObject("content").getJSONArray("__bytes__")
+.getJSONObject(0).getString("fileData").length()).isGreaterThan(0);
+ }
+}
--
To stop receiving notification emails like this one, please contact
jensde...@apache.org.
[geode] branch develop updated: GEODE-5004: Add unit tests for ErrorResultData (#1744)
This is an automated email from the ASF dual-hosted git repository.
jensdeppe pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new c0dc8a3 GEODE-5004: Add unit tests for ErrorResultData (#1744)
c0dc8a3 is described below
commit c0dc8a3d44555f56057e010a8cf5037c45616b9a
Author: Jens Deppe
AuthorDate: Fri Apr 6 09:04:06 2018 -0700
GEODE-5004: Add unit tests for ErrorResultData (#1744)
---
.../internal/cli/result/ErrorResultDataTest.java | 75 ++
1 file changed, 75 insertions(+)
diff --git
a/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/ErrorResultDataTest.java
b/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/ErrorResultDataTest.java
new file mode 100644
index 000..77befd4
--- /dev/null
+++
b/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/ErrorResultDataTest.java
@@ -0,0 +1,75 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
contributor license
+ * agreements. See the NOTICE file distributed with this work for additional
information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache
License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express
+ * or implied. See the License for the specific language governing permissions
and limitations under
+ * the License.
+ */
+
+package org.apache.geode.management.internal.cli.result;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import org.apache.geode.management.cli.Result;
+import org.apache.geode.test.junit.categories.UnitTest;
+
+@Category(UnitTest.class)
+public class ErrorResultDataTest {
+
+ @Test
+ public void emptyError() {
+ErrorResultData result = new ErrorResultData();
+assertThat(result.getGfJsonObject().getString("content")).isEqualTo("{}");
+assertThat(result.getStatus()).isEqualTo(Result.Status.ERROR);
+assertThat(result.getType()).isEqualTo("error");
+ }
+
+ @Test
+ public void errorWithMessage() {
+ErrorResultData result = new ErrorResultData("This is an error");
+
assertThat(result.getGfJsonObject().getJSONObject("content").getString("message"))
+.isEqualTo("[\"This is an error\"]");
+ }
+
+ @Test
+ public void errorWithErrorCode() {
+ErrorResultData result = new ErrorResultData("This is an error");
+result.setErrorCode(77);
+
+
assertThat(result.getGfJsonObject().getJSONObject("content").getString("message"))
+.isEqualTo("[\"This is an error\"]");
+
assertThat(result.getGfJsonObject().getJSONObject("content").getString("errorCode"))
+.isEqualTo("77");
+ }
+
+ @Test
+ public void errorWithMultipleMessages() {
+ErrorResultData result = new ErrorResultData("This is an error");
+result.addLine("This is another error");
+
+
assertThat(result.getGfJsonObject().getJSONObject("content").getString("message"))
+.isEqualTo("[\"This is an error\",\"This is another error\"]");
+ }
+
+ @Test
+ public void withHeaderAndFooter() {
+ErrorResultData result = new ErrorResultData();
+
+String headerFooter = "it was a dark and stormy night";
+result.setHeader(headerFooter);
+result.setFooter(headerFooter);
+
+
assertThat(result.getGfJsonObject().getString("header")).isEqualTo(headerFooter);
+
assertThat(result.getGfJsonObject().getString("footer")).isEqualTo(headerFooter);
+ }
+}
--
To stop receiving notification emails like this one, please contact
jensde...@apache.org.
[geode] branch develop updated: GEODE-5021: Add parameters to connection in jdbc-1.0.xsd (#1748)
This is an automated email from the ASF dual-hosted git repository. klund pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git The following commit(s) were added to refs/heads/develop by this push: new a6a7275 GEODE-5021: Add parameters to connection in jdbc-1.0.xsd (#1748) a6a7275 is described below commit a6a72750021cf6d17a19e1c6adbb51643680e2d6 Author: Kirk Lund AuthorDate: Fri Apr 6 09:21:13 2018 -0700 GEODE-5021: Add parameters to connection in jdbc-1.0.xsd (#1748) --- .../resources/META-INF/schemas/geode.apache.org/schema/jdbc/jdbc-1.0.xsd | 1 + 1 file changed, 1 insertion(+) diff --git a/geode-connectors/src/main/resources/META-INF/schemas/geode.apache.org/schema/jdbc/jdbc-1.0.xsd b/geode-connectors/src/main/resources/META-INF/schemas/geode.apache.org/schema/jdbc/jdbc-1.0.xsd index d4879f4..712ce44 100644 --- a/geode-connectors/src/main/resources/META-INF/schemas/geode.apache.org/schema/jdbc/jdbc-1.0.xsd +++ b/geode-connectors/src/main/resources/META-INF/schemas/geode.apache.org/schema/jdbc/jdbc-1.0.xsd @@ -54,6 +54,7 @@ XML schema for JDBC Connector Service in Geode. + -- To stop receiving notification emails like this one, please contact kl...@apache.org.
[geode] branch develop updated (a6a7275 -> 76dd7e2)
This is an automated email from the ASF dual-hosted git repository.
klund pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git.
from a6a7275 GEODE-5021: Add parameters to connection in jdbc-1.0.xsd
(#1748)
new a956147 GEODE-1279: Rename
FinalStaticArrayShouldNotCauseSegFaultRegressionTest
new 76dd7e2 GEODE_1279: Rename
MembershipAttributesAreSerializableRegressionTest
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
...ArrayShouldNotCauseSegFaultRegressionTest.java} | 55 +++---
...ipAttributesAreSerializableRegressionTest.java} | 30 +++-
2 files changed, 46 insertions(+), 39 deletions(-)
rename
geode-core/src/test/java/org/apache/geode/cache/{FinalStaticArrayShouldNotCauseSegFaultTest.java
=> FinalStaticArrayShouldNotCauseSegFaultRegressionTest.java} (60%)
rename
geode-core/src/test/java/org/apache/geode/cache/{MembershipAttributesAreSerializableTest.java
=> MembershipAttributesAreSerializableRegressionTest.java} (75%)
--
To stop receiving notification emails like this one, please contact
kl...@apache.org.
[geode] 02/02: GEODE_1279: Rename MembershipAttributesAreSerializableRegressionTest
This is an automated email from the ASF dual-hosted git repository.
klund pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 76dd7e22826a1d51e05e9b451e104e05204188ff
Author: Kirk Lund
AuthorDate: Wed Apr 4 10:45:18 2018 -0700
GEODE_1279: Rename MembershipAttributesAreSerializableRegressionTest
---
...ipAttributesAreSerializableRegressionTest.java} | 30 +-
1 file changed, 18 insertions(+), 12 deletions(-)
diff --git
a/geode-core/src/test/java/org/apache/geode/cache/MembershipAttributesAreSerializableTest.java
b/geode-core/src/test/java/org/apache/geode/cache/MembershipAttributesAreSerializableRegressionTest.java
similarity index 75%
rename from
geode-core/src/test/java/org/apache/geode/cache/MembershipAttributesAreSerializableTest.java
rename to
geode-core/src/test/java/org/apache/geode/cache/MembershipAttributesAreSerializableRegressionTest.java
index 00fb577..298c7a7 100644
---
a/geode-core/src/test/java/org/apache/geode/cache/MembershipAttributesAreSerializableTest.java
+++
b/geode-core/src/test/java/org/apache/geode/cache/MembershipAttributesAreSerializableRegressionTest.java
@@ -14,7 +14,7 @@
*/
package org.apache.geode.cache;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -31,7 +31,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
* Tests MembershipAttributes and SubscriptionAttributes to make sure they are
Serializable
*/
@Category({UnitTest.class, MembershipTest.class})
-public class MembershipAttributesAreSerializableTest {
+public class MembershipAttributesAreSerializableRegressionTest {
/**
* Assert that MembershipAttributes are serializable.
@@ -40,16 +40,19 @@ public class MembershipAttributesAreSerializableTest {
public void testMembershipAttributesAreSerializable() throws Exception {
String[] roles = {"a", "b", "c"};
MembershipAttributes outMA = new MembershipAttributes(roles);
+
ByteArrayOutputStream baos = new ByteArrayOutputStream(1000);
-ObjectOutputStream oos = new ObjectOutputStream(baos);
-oos.writeObject(outMA);
+try (ObjectOutputStream oos = new ObjectOutputStream(baos)) {
+ oos.writeObject(outMA);
+}
byte[] data = baos.toByteArray();
ByteArrayInputStream bais = new ByteArrayInputStream(data);
-ObjectInputStream ois = new ObjectInputStream(bais);
-MembershipAttributes inMA = (MembershipAttributes) ois.readObject();
-assertEquals(outMA, inMA);
+try (ObjectInputStream ois = new ObjectInputStream(bais)) {
+ MembershipAttributes inMA = (MembershipAttributes) ois.readObject();
+ assertEquals(outMA, inMA);
+}
}
/**
@@ -58,15 +61,18 @@ public class MembershipAttributesAreSerializableTest {
@Test
public void testSubscriptionAttributesAreSerializable() throws Exception {
SubscriptionAttributes outSA = new SubscriptionAttributes();
+
ByteArrayOutputStream baos = new ByteArrayOutputStream(1000);
-ObjectOutputStream oos = new ObjectOutputStream(baos);
-oos.writeObject(outSA);
+try (ObjectOutputStream oos = new ObjectOutputStream(baos)) {
+ oos.writeObject(outSA);
+}
byte[] data = baos.toByteArray();
ByteArrayInputStream bais = new ByteArrayInputStream(data);
-ObjectInputStream ois = new ObjectInputStream(bais);
-SubscriptionAttributes inSA = (SubscriptionAttributes) ois.readObject();
-assertEquals(outSA, inSA);
+try (ObjectInputStream ois = new ObjectInputStream(bais)) {
+ SubscriptionAttributes inSA = (SubscriptionAttributes) ois.readObject();
+ assertEquals(outSA, inSA);
+}
}
}
--
To stop receiving notification emails like this one, please contact
kl...@apache.org.
[geode] 01/02: GEODE-1279: Rename FinalStaticArrayShouldNotCauseSegFaultRegressionTest
This is an automated email from the ASF dual-hosted git repository.
klund pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
commit a956147cc8dafa456da4f7b41e97ae4dd60327f6
Author: Kirk Lund
AuthorDate: Wed Apr 4 10:40:59 2018 -0700
GEODE-1279: Rename FinalStaticArrayShouldNotCauseSegFaultRegressionTest
---
...ArrayShouldNotCauseSegFaultRegressionTest.java} | 55 +++---
1 file changed, 28 insertions(+), 27 deletions(-)
diff --git
a/geode-core/src/test/java/org/apache/geode/cache/FinalStaticArrayShouldNotCauseSegFaultTest.java
b/geode-core/src/test/java/org/apache/geode/cache/FinalStaticArrayShouldNotCauseSegFaultRegressionTest.java
similarity index 60%
rename from
geode-core/src/test/java/org/apache/geode/cache/FinalStaticArrayShouldNotCauseSegFaultTest.java
rename to
geode-core/src/test/java/org/apache/geode/cache/FinalStaticArrayShouldNotCauseSegFaultRegressionTest.java
index e84b655..b83ea0f 100644
---
a/geode-core/src/test/java/org/apache/geode/cache/FinalStaticArrayShouldNotCauseSegFaultTest.java
+++
b/geode-core/src/test/java/org/apache/geode/cache/FinalStaticArrayShouldNotCauseSegFaultRegressionTest.java
@@ -26,8 +26,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
/**
- * Test case for Trac https://svn.gemstone.com/trac/gemfire/ticket/52289";>#52289.
- *
* Asserts fixes for bug JDK-8076152 in JDK 1.8.0u20 to 1.8.0.u45.
* http://bugs.java.com/bugdatabase/view_bug.do?bug_id=8076152
*
@@ -38,45 +36,48 @@ import org.apache.geode.test.junit.categories.UnitTest;
* This test and its corrections can be removed after the release of JDK
1.8.0u60 if we choose to
* not support 1.8.0u20 - 1.8.0u45 inclusive.
*
+ *
+ * TRAC #52289: HotSpot SIGSEGV in C2 CompilerThread1
(LoadNode::Value(PhaseTransform*) const+0x202)
+ * with JDK 1.8.0_45
+ *
* @since GemFire 8.2
*/
@Category(UnitTest.class)
-public class FinalStaticArrayShouldNotCauseSegFaultTest {
+public class FinalStaticArrayShouldNotCauseSegFaultRegressionTest {
@Test
- public void test() throws IOException, ClassNotFoundException {
-// Iterate enough to cause JIT to compile
-// javax.print.attribute.EnumSyntax::readResolve
+ public void finalStaticArrayShouldNotCauseSegFault() throws Exception {
+// Iterate enough to cause JIT to compile
javax.print.attribute.EnumSyntax::readResolve
for (int i = 0; i < 100_000; i++) {
- // Must execute two or more subclasses with static final arrays of
- // different types.
+ // Must execute two or more subclasses with static final arrays of
different types.
doEvictionAlgorithm();
doEvictionAction();
}
}
- protected void doEvictionAlgorithm() throws IOException,
ClassNotFoundException {
-final ByteArrayOutputStream baos = new ByteArrayOutputStream();
-final ObjectOutputStream oos = new ObjectOutputStream(baos);
-oos.writeObject(EvictionAlgorithm.NONE);
-oos.close();
+ private void doEvictionAlgorithm() throws IOException,
ClassNotFoundException {
+ByteArrayOutputStream baos = new ByteArrayOutputStream();
-final ByteArrayInputStream bais = new
ByteArrayInputStream(baos.toByteArray());
-final ObjectInputStream ois = new ObjectInputStream(bais);
-ois.readObject();
-ois.close();
+try (ObjectOutputStream oos = new ObjectOutputStream(baos)) {
+ oos.writeObject(EvictionAlgorithm.NONE);
+}
+
+try (ObjectInputStream ois =
+new ObjectInputStream(new ByteArrayInputStream(baos.toByteArray( {
+ ois.readObject();
+}
}
- protected void doEvictionAction() throws IOException, ClassNotFoundException
{
-final ByteArrayOutputStream baos = new ByteArrayOutputStream();
-final ObjectOutputStream oos = new ObjectOutputStream(baos);
-oos.writeObject(EvictionAction.NONE);
-oos.close();
+ private void doEvictionAction() throws IOException, ClassNotFoundException {
+ByteArrayOutputStream baos = new ByteArrayOutputStream();
-final ByteArrayInputStream bais = new
ByteArrayInputStream(baos.toByteArray());
-final ObjectInputStream ois = new ObjectInputStream(bais);
-ois.readObject();
-ois.close();
- }
+try (ObjectOutputStream oos = new ObjectOutputStream(baos)) {
+ oos.writeObject(EvictionAction.NONE);
+}
+try (ObjectInputStream ois =
+new ObjectInputStream(new ByteArrayInputStream(baos.toByteArray( {
+ ois.readObject();
+}
+ }
}
--
To stop receiving notification emails like this one, please contact
kl...@apache.org.
[geode-native] branch develop updated: GEODE-4968: Further templatizing CMake product name (#262)
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode-native.git
The following commit(s) were added to refs/heads/develop by this push:
new 8bf8630 GEODE-4968: Further templatizing CMake product name (#262)
8bf8630 is described below
commit 8bf863096a647aa811fc0d1c5ca94ca64ea12eb5
Author: Ryan McMahon
AuthorDate: Fri Apr 6 09:40:42 2018 -0700
GEODE-4968: Further templatizing CMake product name (#262)
* GEODE-4968: Templatizing other cmake variables
Signed-off-by: Michael Oleske
* GEODE-4968: One more missing templatized variable
Signed-off-by: Ryan McMahon
* GEODE-4968: Fixing serializer registration in dotnet example
Signed-off-by: Michael Oleske
* GEODE-4968: don't add dotnet to examples if not windows
* GEODE-4968: Update auto serializer registration
* GEODE-4968: Templatize ROOT cmake var
Signed-off-by: Ryan McMahon
* GEODE-4968: Better directory variable name
Signed-off-by: Michael Oleske
* GEODE-4968: Templatizing remaining templatizable variables
---
examples/CMakeLists.txt | 5 +-
examples/CMakeLists.txt.in | 2 +-
examples/cmake/FindGeodeNative.cmake.in | 121 +++
examples/cpp/CMakeLists.txt.cpp_example.in | 2 +-
examples/cpp/CMakeLists.txt.in | 2 +-
examples/dotnet/CMakeLists.txt | 2 +-
examples/dotnet/CMakeLists.txt.dotnet_example.in | 4 +-
examples/dotnet/CMakeLists.txt.in| 2 +-
examples/dotnet/PdxAutoSerializer/Program.cs | 10 +-
9 files changed, 76 insertions(+), 74 deletions(-)
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 83fa1bb..0566b6c 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -18,8 +18,11 @@ cmake_minimum_required(VERSION 3.10)
project(examples LANGUAGES NONE)
string(REPLACE " " "" PRODUCT_NAME_NOSPACE ${PRODUCT_NAME})
+if (BUILD_CLI)
+ set(DOTNET_SUB_DIRECTORY "add_subdirectory(dotnet)")
+endif()
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt.in
${CMAKE_CURRENT_BINARY_DIR}/CMakeLists.txt COPYONLY)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt.in
${CMAKE_CURRENT_BINARY_DIR}/CMakeLists.txt @ONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindGeodeNative.cmake.in
${CMAKE_CURRENT_BINARY_DIR}/cmake/Find${PRODUCT_NAME_NOSPACE}.cmake @ONLY)
install(FILES
diff --git a/examples/CMakeLists.txt.in b/examples/CMakeLists.txt.in
index 6a9be68..f124022 100644
--- a/examples/CMakeLists.txt.in
+++ b/examples/CMakeLists.txt.in
@@ -18,4 +18,4 @@ cmake_minimum_required(VERSION 3.10)
project(examples LANGUAGES NONE)
add_subdirectory(cpp)
-add_subdirectory(dotnet)
+@DOTNET_SUB_DIRECTORY@
diff --git a/examples/cmake/FindGeodeNative.cmake.in
b/examples/cmake/FindGeodeNative.cmake.in
index aca0650..33b947d 100644
--- a/examples/cmake/FindGeodeNative.cmake.in
+++ b/examples/cmake/FindGeodeNative.cmake.in
@@ -14,55 +14,54 @@
# limitations under the License.
#.rst:
-# FindGeodeNative
+# Find@PRODUCT_NAME_NOSPACE@
# -
#
-# Find the Geode Native headers and library.
+# Find the @PRODUCT_NAME@ headers and library.
#
# Imported Targets
#
#
# This module defines the following :prop_tgt:`IMPORTED` targets:
#
-# ``GeodeNative::cpp``
-# ``GeodeNative:dotnet``
+# ``@PRODUCT_NAME_NOSPACE@::cpp``
+# ``@PRODUCT_NAME_NOSPACE@:dotnet``
#
# Result Variables
#
#
# This module will set the following variables in your project:
#
-# ``GeodeNative_FOUND``
-# true if the Geode Native headers and libraries were found.
+# ``@PRODUCT_NAME_NOSPACE@_FOUND``
+# true if the @PRODUCT_NAME@ headers and libraries were found.
#
-# ``GeodeNative_DOTNET_LIBRARY``
+# ``@PRODUCT_NAME_NOSPACE@_DOTNET_LIBRARY``
# Path to .NET assembly file.
#
-set(_GEODE_NATIVE_ROOT "")
-if(GeodeNative_ROOT AND IS_DIRECTORY "${GeodeNative_ROOT}")
-set(_GEODE_NATIVE_ROOT "${GeodeNative_ROOT}")
-set(_GEODE_NATIVE_ROOT_EXPLICIT 1)
+set(_@PRODUCT_NAME_NOSPACE@_ROOT "")
+if(@PRODUCT_NAME_NOSPACE@_ROOT AND IS_DIRECTORY
"${@PRODUCT_NAME_NOSPACE@_ROOT}")
+set(_@PRODUCT_NAME_NOSPACE@_ROOT "${@PRODUCT_NAME_NOSPACE@_ROOT}")
+set(_@PRODUCT_NAME_NOSPACE@_ROOT_EXPLICIT 1)
else()
-set(_ENV_GEODE_NATIVE_ROOT "")
+set(_ENV_@PRODUCT_NAME_NOSPACE@_ROOT "")
if(DEFINED ENV{GFCPP})
-file(TO_CMAKE_PATH "$ENV{GFCPP}" _ENV_GEODE_NATIVE_ROOT)
+file(TO_CMAKE_PATH "$ENV{GFCPP}" _ENV_@PRODUCT_NAME_NOSPACE@_ROOT)
endif()
-if(_ENV_GEODE_NATIVE_ROOT AND IS_DIRECTORY "${_ENV_GEODE_NATIVE_ROOT}")
-set(_GEODE_NATIVE_ROOT "${_ENV_GEODE_NATIVE_ROOT}")
-set(_GEODE_NATIVE_ROOT_EXPLICIT 0)
+if(_ENV_@PRODUCT_NAME_NOSPACE@_ROOT AND IS_DIRECTORY
"${_ENV_@PRODU
[geode-native] branch develop updated: GEODE-4994: No warngins on GCC (#263)
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode-native.git
The following commit(s) were added to refs/heads/develop by this push:
new f098ca6 GEODE-4994: No warngins on GCC (#263)
f098ca6 is described below
commit f098ca6fa11c067579346ea202f792874efe7277
Author: Jacob Barrett
AuthorDate: Fri Apr 6 09:41:46 2018 -0700
GEODE-4994: No warngins on GCC (#263)
-Wall
-Werror
-Wpedantic
---
CMakeLists.txt | 11 ++-
cppcache/include/geode/CacheableBuiltins.hpp | 68 +++
cppcache/include/geode/DataOutput.hpp | 2 +-
cppcache/integration-test/BBNamingContext.cpp | 6 +-
cppcache/integration-test/CacheHelper.cpp | 7 --
cppcache/integration-test/fw_dunit.cpp | 4 +-
cppcache/integration-test/fw_dunit.hpp | 2 +-
cppcache/integration-test/fw_spawn.hpp | 2 +-
cppcache/integration-test/testLogger.cpp | 12 +--
cppcache/integration-test/testThinClientCq.cpp | 3 +-
.../testThinClientLRUExpiration.cpp| 15 ++--
.../testThinClientSecurityCQAuthorizationMU.cpp| 22 +
...tThinClientSecurityDurableCQAuthorizationMU.cpp | 22 +
.../testXmlCacheCreationWithOverFlow.cpp | 4 +-
.../testXmlCacheCreationWithPools.cpp | 30 ---
cppcache/src/CacheableBuiltins.cpp | 16 ++--
cppcache/src/CqEventImpl.cpp | 5 +-
cppcache/src/LocalRegion.cpp | 4 +-
cppcache/src/Log.cpp | 3 +-
cppcache/src/PdxFieldType.cpp | 4 +-
cppcache/src/PdxInstanceImpl.cpp | 4 +-
cppcache/src/SerializationRegistry.cpp | 2 +-
cppcache/src/TcrConnection.cpp | 5 +-
cppcache/src/ThinClientBaseDM.cpp | 2 +-
cppcache/src/ThinClientPoolDM.cpp | 9 +-
cppcache/src/ThinClientRedundancyManager.cpp | 4 +-
cppcache/src/ThinClientRegion.cpp | 14 ++--
cryptoimpl/DHImpl.cpp | 96 --
dhimpl/DHImpl.cpp | 77 +
tests/cpp/fwklib/TcpIpc.cpp| 7 +-
tests/cpp/security/Security.cpp| 3 -
tests/cpp/testobject/BatchObject.cpp | 3 +-
tests/cpp/testobject/DeltaFastAssetAccount.hpp | 2 +-
tests/cpp/testobject/DeltaPSTObject.cpp| 8 +-
tests/cpp/testobject/EqStruct.cpp | 2 +-
tests/cpp/testobject/PSTObject.cpp | 2 +-
tests/cpp/testobject/PortfolioPdx.cpp | 4 -
tests/cpp/testobject/PositionPdx.cpp | 1 -
tests/cpp/testobject/VariousPdxTypes.cpp | 5 --
39 files changed, 193 insertions(+), 299 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b5778e3..3bee799 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -176,8 +176,17 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "SunPro")
#TODO look into CMAKE_CXX_STANDARD_LIBRARIES
target_link_libraries(c++11 INTERFACE -std=c++11 stdc++ gcc_s CrunG3 m c)
-elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+elseif (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,defs")
+ target_compile_options(_WarningsAsError INTERFACE
+-Werror
+-Wall
+-Wno-unknown-pragmas #TODO fix
+-Wno-unused-variable #TODO fix
+-Wpedantic
+# -Wshadow TODO fix
+# -Weffc++ TODO fix
+)
elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
target_compile_options(_WarningsAsError INTERFACE
diff --git a/cppcache/include/geode/CacheableBuiltins.hpp
b/cppcache/include/geode/CacheableBuiltins.hpp
index fa0fb71..cfbf118 100644
--- a/cppcache/include/geode/CacheableBuiltins.hpp
+++ b/cppcache/include/geode/CacheableBuiltins.hpp
@@ -261,61 +261,61 @@ class APACHE_GEODE_EXPORT CacheableContainerType : public
Cacheable, public TBas
// Instantiations for the built-in CacheableKeys
-_GEODE_CACHEABLE_KEY_TYPE_DEF_(bool, CacheableBoolean);
+_GEODE_CACHEABLE_KEY_TYPE_DEF_(bool, CacheableBoolean)
/**
* An immutable wrapper for booleans that can serve as
* a distributable key object for caching.
*/
-_GEODE_CACHEABLE_KEY_TYPE_(bool, CacheableBoolean);
+_GEODE_CACHEABLE_KEY_TYPE_(bool, CacheableBoolean)
-_GEODE_CACHEABLE_KEY_TYPE_DEF_(int8_t, CacheableByte);
+_GEODE_CACHEABLE_KEY_TYPE_DEF_(int8_t, CacheableByte)
/**
* An immutable wrapper for bytes that can serve as
* a distributable key object for caching.
*/
-_GEODE_CACHEABLE_KEY_TYPE_(int8_t, CacheableByte);
+_GEODE_CACHEABLE_KEY_TYPE_(int8_t, CacheableByte)
-_GEODE_CACHEABLE_KEY_TYPE_DEF_(double, CacheableDouble);
+_GEODE_CACHEABLE_KEY_TYPE_DEF_(double, CacheableDouble)
/**
* An immutable wrapper for
[geode] branch develop updated: COMMIT THEN REVIEW. fix spelling: PARTITIION -> PARTITION
This is an automated email from the ASF dual-hosted git repository. kmiller pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git The following commit(s) were added to refs/heads/develop by this push: new eab8252 COMMIT THEN REVIEW. fix spelling: PARTITIION -> PARTITION eab8252 is described below commit eab825295a3ea4bd4203458edd2a7434571e79b8 Author: Karen Miller AuthorDate: Fri Apr 6 10:10:46 2018 -0700 COMMIT THEN REVIEW. fix spelling: PARTITIION -> PARTITION --- geode-docs/reference/topics/cache_xml.html.md.erb| 2 +- geode-docs/reference/topics/client-cache.html.md.erb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/geode-docs/reference/topics/cache_xml.html.md.erb b/geode-docs/reference/topics/cache_xml.html.md.erb index 842b809..f44025e 100644 --- a/geode-docs/reference/topics/cache_xml.html.md.erb +++ b/geode-docs/reference/topics/cache_xml.html.md.erb @@ -2842,7 +2842,7 @@ Defines a region in the cache. See [](#region-attribute + refid="PARTITION_REDUNDANT"> ... diff --git a/geode-docs/reference/topics/client-cache.html.md.erb b/geode-docs/reference/topics/client-cache.html.md.erb index e04b735..873ecec 100644 --- a/geode-docs/reference/topics/client-cache.html.md.erb +++ b/geode-docs/reference/topics/client-cache.html.md.erb @@ -1928,7 +1928,7 @@ Defines a region in the cache. See [ ](cache_xml.html#re + refid="PARTITION_REDUNDANT"> ... @@ -2509,7 +2509,7 @@ Defines a region in the cache. See [ ](cache_xml.html#re + refid="PARTITION_REDUNDANT"> ... -- To stop receiving notification emails like this one, please contact kmil...@apache.org.
[geode] 01/01: Merge pull request #1751 from jdeppe-pivotal/feature/GEODE-5026
This is an automated email from the ASF dual-hosted git repository. dixie pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git commit 7b3e80972677634d4c83a43c8b592b9e0514dfe8 Merge: eab8252 947e37b Author: Dick Cavender AuthorDate: Fri Apr 6 10:33:48 2018 -0700 Merge pull request #1751 from jdeppe-pivotal/feature/GEODE-5026 GEODE-5026: Do not run acceptanceTest in parallel under docker ci/pipelines/develop.yml | 2 -- gradle/docker.gradle | 1 - 2 files changed, 3 deletions(-) -- To stop receiving notification emails like this one, please contact di...@apache.org.
[geode] branch develop updated (eab8252 -> 7b3e809)
This is an automated email from the ASF dual-hosted git repository. dixie pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from eab8252 COMMIT THEN REVIEW. fix spelling: PARTITIION -> PARTITION add 947e37b GEODE-5026: Do not run acceptanceTest in parallel under docker new 7b3e809 Merge pull request #1751 from jdeppe-pivotal/feature/GEODE-5026 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: ci/pipelines/develop.yml | 2 -- gradle/docker.gradle | 1 - 2 files changed, 3 deletions(-) -- To stop receiving notification emails like this one, please contact di...@apache.org.
[geode] branch develop updated: GEODE-4518: Replace DSCODE with an enumeration. (#1738)
This is an automated email from the ASF dual-hosted git repository.
pivotalsarge pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new 804c053 GEODE-4518: Replace DSCODE with an enumeration. (#1738)
804c053 is described below
commit 804c053fdfbce4b7f1f810b1019f778c02f50020
Author: Michael "Sarge" Dodge
AuthorDate: Fri Apr 6 11:52:09 2018 -0700
GEODE-4518: Replace DSCODE with an enumeration. (#1738)
* GEODE-4518: Replace DSCODE with an enumeration.
- Deprecate DSCODE interface.
- Introduce HeaderByte enum.
- Replace explicit references to DSCODE with
explicit references to HeaderByte.
* GEODE-4518: Update analysis files.
* GEODE-4518: Add unit test for value uniqueness.
* GEODE-4518: Convert DSCODE into enum that replaces HeaderByte.
---
.../main/java/org/apache/geode/DataSerializer.java | 20 +-
.../java/org/apache/geode/internal/DSCODE.java | 160 ++---
.../geode/internal/InternalDataSerializer.java | 655 -
.../internal/cache/CacheDistributionAdvisor.java | 2 +-
.../cache/CachedDeserializableFactory.java | 2 +-
.../geode/internal/cache/GemFireCacheImpl.java | 2 +-
.../org/apache/geode/internal/cache/Token.java | 2 +-
.../cache/snapshot/RegionSnapshotServiceImpl.java | 2 +-
.../cache/tier/sockets/ChunkedMessage.java | 4 +-
.../tier/sockets/ClientUpdateMessageImpl.java | 4 +-
.../cache/tier/sockets/HAEventWrapper.java | 4 +-
.../geode/internal/cache/tier/sockets/Part.java| 2 +-
.../internal/offheap/AbstractStoredObject.java | 3 +-
.../apache/geode/internal/offheap/DataType.java| 403 +++--
.../internal/offheap/OffHeapRegionEntryHelper.java | 4 +-
.../internal/offheap/OffHeapStoredObject.java | 2 +-
.../org/apache/geode/internal/util/BlobHelper.java | 2 +-
.../main/java/org/apache/geode/pdx/FieldType.java | 4 +-
.../org/apache/geode/pdx/internal/EnumInfo.java| 2 -
.../apache/geode/pdx/internal/PdxInstanceEnum.java | 2 +-
.../apache/geode/pdx/internal/PdxInstanceImpl.java | 4 +-
.../apache/geode/pdx/internal/PdxReaderImpl.java | 7 +-
.../org/apache/geode/pdx/internal/PdxString.java | 18 +-
.../apache/geode/pdx/internal/PdxWriterImpl.java | 6 +-
.../java/org/apache/geode/internal/DSCODETest.java | 39 ++
.../geode/internal/offheap/DataTypeJUnitTest.java | 40 +-
.../internal/offheap/MemoryBlockNodeJUnitTest.java | 2 +-
.../offheap/OffHeapRegionEntryHelperJUnitTest.java | 2 +-
.../offheap/OffHeapStoredObjectJUnitTest.java | 8 +-
.../offheap/TinyStoredObjectJUnitTest.java | 3 +-
.../apache/geode/pdx/PdxSerializableJUnitTest.java | 20 +-
.../apache/geode/codeAnalysis/excludedClasses.txt | 3 +-
.../codeAnalysis/sanctionedDataSerializables.txt | 2 +-
33 files changed, 799 insertions(+), 636 deletions(-)
diff --git a/geode-core/src/main/java/org/apache/geode/DataSerializer.java
b/geode-core/src/main/java/org/apache/geode/DataSerializer.java
index 5627b68..c974287 100644
--- a/geode-core/src/main/java/org/apache/geode/DataSerializer.java
+++ b/geode-core/src/main/java/org/apache/geode/DataSerializer.java
@@ -220,7 +220,7 @@ public abstract class DataSerializer {
// if readObject/writeObject is called:
// the first CLASS byte indicates it's a Class, the second
// one indicates it's a non-primitive Class
- out.writeByte(DSCODE.CLASS);
+ out.writeByte(DSCODE.CLASS.toByte());
String cname = c.getName();
cname = InternalDataSerializer.processOutgoingClassName(cname, out);
writeString(cname, out);
@@ -260,7 +260,7 @@ public abstract class DataSerializer {
InternalDataSerializer.checkIn(in);
byte typeCode = in.readByte();
-if (typeCode == DSCODE.CLASS) {
+if (typeCode == DSCODE.CLASS.toByte()) {
String className = readString(in);
Class c = InternalDataSerializer.getCachedClass(className); // fix
for bug 41206
return c;
@@ -505,7 +505,7 @@ public abstract class DataSerializer {
if (isTraceSerialzerVerbose) {
logger.trace(LogMarker.SERIALIZER_VERBOSE, "Writing NULL_STRING");
}
- out.writeByte(DSCODE.NULL_STRING);
+ out.writeByte(DSCODE.NULL_STRING.toByte());
} else {
// writeUTF is expensive - it creates a char[] to fetch
@@ -538,14 +538,14 @@ public abstract class DataSerializer {
if (isTraceSerialzerVerbose) {
logger.trace(LogMarker.SERIALIZER_VERBOSE, "Writing utf
HUGE_STRING of len={}", len);
}
- out.writeByte(DSCODE.HUGE_STRING);
+ out.writeByte(DSCODE.HUGE_STRING.toByte());
out.writeInt(len);
out.writeChars(value);
} else {
if (isTraceSerialzerVerbose) {
logger.trace(LogMarker.SERIALIZER_VE
[geode] branch feature/GEODE_5027 created (now d211d7e)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch feature/GEODE_5027 in repository https://gitbox.apache.org/repos/asf/geode.git. at d211d7e GEODE-5027 Bump version to 1.6.0 This branch includes the following new commits: new 58820e7 GEODE-5027 Bump version to 1.6.0 new d211d7e GEODE-5027 Bump version to 1.6.0 The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. -- To stop receiving notification emails like this one, please contact bschucha...@apache.org.
[geode] 01/02: GEODE-5027 Bump version to 1.6.0
This is an automated email from the ASF dual-hosted git repository.
bschuchardt pushed a commit to branch feature/GEODE_5027
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 58820e78d5ee10c922011c5beea9bf8eedf78121
Author: Bruce Schuchardt
AuthorDate: Fri Apr 6 10:45:17 2018 -0700
GEODE-5027 Bump version to 1.6.0
Bumping version to 1.6.0
---
geode-core/src/main/java/org/apache/geode/internal/Version.java | 8 +++-
.../src/test/java/org/apache/geode/internal/VersionJUnitTest.java | 6 ++
geode-old-versions/build.gradle | 1 +
3 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/geode-core/src/main/java/org/apache/geode/internal/Version.java
b/geode-core/src/main/java/org/apache/geode/internal/Version.java
index cf5bb5d..d01f9ec 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/Version.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/Version.java
@@ -212,11 +212,17 @@ public class Version implements Comparable {
public static final Version GEODE_150 =
new Version("GEODE", "1.5.0", (byte) 1, (byte) 5, (byte) 0, (byte) 0,
GEODE_150_ORDINAL);
+
+ private static final byte GEODE_160_ORDINAL = 85;
+
+ public static final Version GEODE_160 =
+ new Version("GEODE", "1.6.0", (byte) 1, (byte) 6, (byte) 0, (byte) 0,
GEODE_160_ORDINAL);
+
/**
* This constant must be set to the most current version of the product. !!!
NOTE: update
* HIGHEST_VERSION when changing CURRENT !!!
*/
- public static final Version CURRENT = GEODE_150;
+ public static final Version CURRENT = GEODE_160;
/**
* A lot of versioning code needs access to the current version's ordinal
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/VersionJUnitTest.java
b/geode-core/src/test/java/org/apache/geode/internal/VersionJUnitTest.java
index 8cd4d81..ef0e0bc 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/VersionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/VersionJUnitTest.java
@@ -34,6 +34,12 @@ public class VersionJUnitTest {
compare(Version.GFE_81, Version.GFE_70);
compare(Version.GFE_81, Version.GFE_71);
compare(Version.GFE_81, Version.GFE_80);
+compare(Version.GFE_82, Version.GFE_81);
+compare(Version.GEODE_110, Version.GFE_82);
+compare(Version.GEODE_120, Version.GEODE_111);
+compare(Version.GEODE_130, Version.GEODE_120);
+compare(Version.GEODE_140, Version.GEODE_130);
+compare(Version.GEODE_150, Version.GEODE_140);
}
private void compare(Version later, Version earlier) {
diff --git a/geode-old-versions/build.gradle b/geode-old-versions/build.gradle
index c394630..3fea08e 100644
--- a/geode-old-versions/build.gradle
+++ b/geode-old-versions/build.gradle
@@ -95,4 +95,5 @@ task createGeodeClasspathsFile {
addOldVersion('test120', '1.2.0', true)
addOldVersion('test130', '1.3.0', true)
addOldVersion('test140', '1.4.0', true)
+ addOldVersion('test150', '1.5.0', true)
}
--
To stop receiving notification emails like this one, please contact
bschucha...@apache.org.
[geode] 02/02: GEODE-5027 Bump version to 1.6.0
This is an automated email from the ASF dual-hosted git repository.
bschuchardt pushed a commit to branch feature/GEODE_5027
in repository https://gitbox.apache.org/repos/asf/geode.git
commit d211d7e2883adb78ee58ee947ed18479784766fa
Author: Bruce Schuchardt
AuthorDate: Fri Apr 6 11:53:48 2018 -0700
GEODE-5027 Bump version to 1.6.0
* I removed junk in Version.java that hasn't been used since the SQLFire/GFX
days.
* I also removed AcceptorImpl.VERSION which seemed to serve no good purpose.
* I added a unit test to make sure that folks update the CommandInitializer
table when adding a new Version.
* I changed CommandInitializer to not create new maps unless necessary.
---
.../java/org/apache/geode/internal/Version.java| 57 ++---
.../apache/geode/internal/cache/tier/Acceptor.java | 7 --
.../geode/internal/cache/tier/ConnectionProxy.java | 2 +-
.../tier/sockets/ClientDataSerializerMessage.java | 2 +-
.../cache/tier/sockets/ClientTombstoneMessage.java | 2 +-
.../cache/tier/sockets/CommandInitializer.java | 95 ++
.../tier/sockets/ServerSideHandshakeFactory.java | 2 +-
.../apache/geode/internal/VersionJUnitTest.java| 8 ++
8 files changed, 44 insertions(+), 131 deletions(-)
diff --git a/geode-core/src/main/java/org/apache/geode/internal/Version.java
b/geode-core/src/main/java/org/apache/geode/internal/Version.java
index d01f9ec..5c67838 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/Version.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/Version.java
@@ -51,15 +51,10 @@ public class Version implements Comparable {
private final byte release;
private final byte patch;
- /**
- * Set to non-null if the underlying GemFire version is different from
product version
- */
- private Version gemfireVersion;
-
/** byte used as ordinal to represent this Version */
private final short ordinal;
- public static final int HIGHEST_VERSION = 80;
+ public static final int HIGHEST_VERSION = 85;
private static final Version[] VALUES = new Version[HIGHEST_VERSION + 1];
@@ -218,6 +213,8 @@ public class Version implements Comparable {
public static final Version GEODE_160 =
new Version("GEODE", "1.6.0", (byte) 1, (byte) 6, (byte) 0, (byte) 0,
GEODE_160_ORDINAL);
+ /* NOTE: when adding a new version bump the ordinal by 5. Ordinals can be
short ints */
+
/**
* This constant must be set to the most current version of the product. !!!
NOTE: update
* HIGHEST_VERSION when changing CURRENT !!!
@@ -249,21 +246,11 @@ public class Version implements Comparable {
this.ordinal = ordinal;
this.methodSuffix = this.productName + "_" + this.majorVersion + "_" +
this.minorVersion + "_"
+ this.release + "_" + this.patch;
-this.gemfireVersion = null;
if (ordinal != TOKEN_ORDINAL) {
VALUES[this.ordinal] = this;
}
}
- /**
- * Creates a new instance of Version with a different
underlying GemFire version
- */
- private Version(String product, String name, byte major, byte minor, byte
release, byte patch,
- byte ordinal, Version gemfireVersion) {
-this(product, name, major, minor, release, patch, ordinal);
-this.gemfireVersion = gemfireVersion;
- }
-
/** Return the Version represented by specified ordinal */
public static Version fromOrdinal(short ordinal, boolean forGFEClients)
throws UnsupportedVersionException {
@@ -341,26 +328,6 @@ public class Version implements Comparable {
}
/**
- * Fixed number of bytes required for serializing this version when
"compressed" flag is false in
- * {@link #writeOrdinal(DataOutput, boolean)}.
- */
- public static int uncompressedSize() {
-return 3;
- }
-
- /**
- * Fixed number of bytes required for serializing this version when
"compressed" flag is true in
- * {@link #writeOrdinal(DataOutput, boolean)}.
- */
- public int compressedSize() {
-if (ordinal <= Byte.MAX_VALUE) {
- return 1;
-} else {
- return 3;
-}
- }
-
- /**
* Write the given ordinal (result of {@link #ordinal()}) to given {@link
ByteBuffer}. This keeps
* the serialization of ordinal compatible with previous versions writing a
single byte to
* DataOutput when possible, and a token with 2 bytes if it is large.
@@ -370,8 +337,7 @@ public class Version implements Comparable {
* @param compressed if true, then use single byte for ordinal < 128, and
three bytes for beyond
*that, else always use three bytes where the first byte is {@link
#TOKEN_ORDINAL}
*/
- public static void writeOrdinal(ByteBuffer buffer, short ordinal, boolean
compressed)
- throws IOException {
+ public static void writeOrdinal(ByteBuffer buffer, short ordinal, boolean
compressed) {
if (compressed && ordinal <= Byte.MAX_VALUE) {
buffer.put((byte) ordinal);
} else {
@@ -452,18 +418,10 @@ public class Version implements
[geode-site] branch master updated: Update releases page for v1.5
This is an automated email from the ASF dual-hosted git repository.
dbarnes pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/geode-site.git
The following commit(s) were added to refs/heads/master by this push:
new a852853 Update releases page for v1.5
a852853 is described below
commit a852853956f8ea85fc293d55cd38c13281375c71
Author: Dave Barnes
AuthorDate: Fri Apr 6 13:37:35 2018 -0700
Update releases page for v1.5
---
website/content/releases/index.html | 53 +
1 file changed, 53 insertions(+)
diff --git a/website/content/releases/index.html
b/website/content/releases/index.html
index 6123396..ff65490 100644
--- a/website/content/releases/index.html
+++ b/website/content/releases/index.html
@@ -35,6 +35,59 @@ under the License. -->
+
+1.5.0
+
+https://cwiki.apache.org/confluence/display/GEODE/Release+Notes";>Release
Notes
+
+
+
+ Binaries
+ [ http://apache.org/dyn/closer.cgi/geode/1.5.0/apache-geode-1.5.0.zip";>ZIP,
https://dist.apache.org/repos/dist/release/geode/1.5.0/apache-geode-1.5.0.zip.sha256";>SHA-256,
+ https://dist.apache.org/repos/dist/release/geode/1.5.0/apache-geode-1.5.0.zip.asc";>PGP
] -
+ [http://apache.org/dyn/closer.cgi/geode/1.5.0/apache-geode-1.5.0.tgz";>TGZ,
https://dist.apache.org/repos/dist/release/geode/1.5.0/apache-geode-1.5.0.tgz.sha256";>SHA-256,
+ https://dist.apache.org/repos/dist/release/geode/1.5.0/apache-geode-1.5.0.tgz.asc";>PGP
]
+
+
+ Source
+ [ http://apache.org/dyn/closer.cgi/geode/1.5.0/apache-geode-1.5.0-src.zip";>ZIP,
https://dist.apache.org/repos/dist/release/geode/1.5.0/apache-geode-1.5.0-src.zip.sha256";>SHA-256,
+ https://dist.apache.org/repos/dist/release/geode/1.5.0/apache-geode-1.5.0-src.zip.asc";>PGP
+] -
+ [http://apache.org/dyn/closer.cgi/geode/1.5.0/apache-geode-1.5.0-src.tgz";>TGZ,
https://dist.apache.org/repos/dist/release/geode/1.5.0/apache-geode-1.5.0-src.tgz.sha256";>SHA-256,
+ https://dist.apache.org/repos/dist/release/geode/1.5.0/apache-geode-1.5.0-src.tgz.asc";>PGP
+ ]
+
+
+ Examples
+ [ http://apache.org/dyn/closer.cgi/geode/1.5.0/apache-geode-examples-1.5.0.zip";>ZIP,
https://dist.apache.org/repos/dist/release/geode/1.5.0/apache-geode-examples-1.5.0.zip.sha256";>SHA-256,
+ https://dist.apache.org/repos/dist/release/geode/1.5.0/apache-geode-examples-1.5.0.zip.asc";>PGP
+] -
+ [http://apache.org/dyn/closer.cgi/geode/1.5.0/apache-geode-examples-1.5.0.tar.gz";>TAR.GZ,
https://dist.apache.org/repos/dist/release/geode/1.5.0/apache-geode-examples-1.5.0.tar.gz.sha256";>SHA-256,
+ https://dist.apache.org/repos/dist/release/geode/1.5.0/apache-geode-examples-1.5.0.tar.gz.asc";>PGP
+ ]
+
+
+
+
+ Gradle
+
+ dependencies {
+compile 'org.apache.geode:geode-core:1.5.0'
+ }
+
+ Maven
+
+
+
+ org.apache.geode
+ geode-core
+ 1.5.0
+
+
+
+
+
+
1.4.0
--
To stop receiving notification emails like this one, please contact
dbar...@apache.org.
[geode] 01/01: Merge branch 'release/1.5.0'
This is an automated email from the ASF dual-hosted git repository. sbawaskar pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/geode.git commit e35aac5a4b5f497df014c61a195d80bc6d73de91 Merge: d234394 1be57f3 Author: Swapnil Bawaskar AuthorDate: Fri Apr 6 13:09:30 2018 -0700 Merge branch 'release/1.5.0' NOTICE |4 +- README.md |2 +- build.gradle | 64 +- buildSrc/build.gradle |4 +- .../geode/gradle/TestPropertiesWriter.groovy |3 - .../javac/EnsureCorrectRunsWithProcessor.java | 135 + .../services/javax.annotation.processing.Processor |1 + .../org/apache/geode/javac/SimpleClassFile.java| 42 + .../org/apache/geode/javac/SimpleFileManager.java | 46 + .../org/apache/geode/javac/SimpleSourceFile.java | 35 + .../geode/javac/TestAnnotationProcessor.java | 51 + .../java/org/apache/geode/javac/TestCompiler.java | 51 + ci/bin/concourse_job_performance.py| 120 + ci/docker/Dockerfile | 12 +- ci/docker/initdocker |2 +- ci/pipelines/develop.yml | 53 +- ci/pipelines/docker-images.yml |9 +- ci/pipelines/meta.yml | 19 + ci/pipelines/metrics.yml | 159 + ci/scripts/build-examples.sh | 26 + ci/scripts/capture-call-stacks.sh | 75 + ci/scripts/concourse_job_performance.sh| 37 + ci/scripts/test-archive.sh |9 +- ci/scripts/test-run.sh |9 + ci/scripts/update-passing-ref.sh |2 +- docker/Dockerfile | 82 +- docker/README.md |2 +- etc/eclipse-java-google-style.xml | 598 +-- .../session/internal/common/SessionCache.java | 12 +- .../session/internal/filter/SessionManager.java| 16 +- .../filter/attributes/SessionAttributes.java | 24 +- .../internal/jmx/SessionStatisticsMXBean.java |6 +- .../geode/modules/gatewaydelta/GatewayDelta.java |6 +- .../gatewaydelta/GatewayDeltaCreateEvent.java |4 +- .../modules/gatewaydelta/GatewayDeltaEvent.java|2 +- .../modules/session/catalina/SessionCache.java | 36 +- .../modules/session/catalina/SessionManager.java | 26 +- .../internal/DeltaSessionAttributeEvent.java |3 +- .../geode/modules/util/BootstrappingFunction.java | 26 +- .../geode/modules/util/CreateRegionFunction.java | 25 +- .../geode/modules/util/RegionSizeFunction.java |9 + .../TouchPartitionedRegionEntriesFunction.java | 25 +- .../util/TouchReplicatedRegionEntriesFunction.java | 29 +- .../modules/util/ModuleFunctionsSecurityTest.java | 75 + geode-assembly/build.gradle|7 +- geode-assembly/src/main/dist/LICENSE | 22 +- geode-assembly/src/main/dist/NOTICE| 10 +- .../cli/commands/DeployWithLargeJarTest.java |8 +- .../cli/commands/GfshStartLocatorLogTest.java |3 +- .../LogsAreFullyRedactedAcceptanceTest.java| 126 + .../cli/commands/StartLocatorAcceptanceTest.java | 60 + .../cli/commands/StartLocatorCommandTest.java | 97 + .../cli/commands/StartServerCommandTest.java | 84 + .../internal/web/RestFunctionExecuteDUnitTest.java | 124 + .../internal/web/RestSecurityIntegrationTest.java | 150 +- .../src/test/resources/expected_jars.txt | 11 + geode-assembly/src/test/resources/security.json| 45 + geode-benchmarks/build.gradle | 28 - .../benchmark/RangeQueryWithIndexBenchmark.java| 105 - .../cache/benchmark/RegionOperationBenchmark.java | 63 - geode-book/Gemfile |2 +- geode-book/Gemfile.lock| 70 +- geode-book/config.yml |7 +- .../source/subnavs/geode-subnav.erb| 11 +- geode-book/redirects.rb|4 +- geode-client-protocol/build.gradle | 30 - .../protocol/ClientProtocolMessageHandler.java | 40 - .../apache/geode/internal/protocol/Failure.java| 48 - .../protocol/LocatorMessageExecutionContext.java | 61 - .../internal/protocol/MessageExecutionContext.java | 54 - .../geode/internal/protocol/OperationContext.java | 65 - .../geode/internal/protocol/ProtocolErrorCode.java | 32 - .../internal/protocol/ProtocolSerializer.java | 34 - .../org/apache/geode/internal/protocol/Result.java | 28 - .../protocol/ServerMessageExecutionContext.java| 60 - .../apache/geode/internal/protocol/Su
[geode-examples] branch master updated (5b413a3 -> fdd79ec)
This is an automated email from the ASF dual-hosted git repository.
sbawaskar pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/geode-examples.git.
from 5b413a3 Merge branch 'release/1.4.0'
add d9f911f Updating version of geode to 1.5.0-SNAPSHOT
add 58eb042 GEODE-4119: Add an example of eviction.
add 5df2a69 GEODE-4119: Add an example of eviction.
add eef628b GEODE-3868: Client security example should use SSL
add 26b4f09 GEODE-4428: Fix links for queries and Lucene. (#47)
add e28850d GEODE-4253: Add an example for expiration. (#44)
add 0d04c0b GEODE-4440: Create an example that demonstrates OQL compact
range indexes. (#48)
add 44a19be GEODE-4646: Add build-specific instructions. (#49)
add 36f4060 GEODE-4666: Ensure a clean working environment for examples.
(#52)
add 4941f05 updated version in preparation of the release
new fdd79ec Merge branch 'release/1.5.0'
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
README.md | 40 ---
build.gradle | 44 +++-
clientSecurity/README.md | 3 +-
clientSecurity/example_security.properties | 6 ++
clientSecurity/keystore.jks| Bin 0 -> 515 bytes
clientSecurity/scripts/start.gfsh | 7 +-
clientSecurity/scripts/stop.gfsh | 4 +-
.../geode_examples/clientSecurity/Example.java | 5 +
clientSecurity/truststore.jks | Bin 0 -> 515 bytes
eviction/README.md | 53 +
{queries => eviction}/scripts/start.gfsh | 8 +-
{writer => eviction}/scripts/stop.gfsh | 0
.../apache/geode_examples/eviction}/Example.java | 36 +++
expiration/README.md | 54 ++
{loader => expiration}/scripts/start.gfsh | 9 +-
{writer => expiration}/scripts/stop.gfsh | 0
.../apache/geode_examples/expiration}/Example.java | 70 +++-
gradle.properties | 4 +-
indexes/README.md | 57 ++
{loader => indexes}/scripts/start.gfsh | 9 +-
{writer => indexes}/scripts/stop.gfsh | 0
.../org/apache/geode_examples/indexes/Example.java | 82 ++
.../apache/geode_examples/indexes/FlightCode.java | 42
.../apache/geode_examples/indexes/Passenger.java | 66
.../geode_examples/indexes/RegionPopulator.java| 76 +
serialization/README.md| 61 +++
{replicated => serialization}/scripts/start.gfsh | 5 +-
{functions => serialization}/scripts/stop.gfsh | 4 +-
.../geode_examples/serialization/Country.java | 118 +
.../geode_examples/serialization/Example.java | 107 +++
settings.gradle| 4 +
31 files changed, 866 insertions(+), 108 deletions(-)
create mode 100644 clientSecurity/keystore.jks
create mode 100644 clientSecurity/truststore.jks
create mode 100644 eviction/README.md
copy {queries => eviction}/scripts/start.gfsh (88%)
mode change 100644 => 100755
copy {writer => eviction}/scripts/stop.gfsh (100%)
mode change 100644 => 100755
copy {listener/src/main/java/org/apache/geode_examples/listener =>
eviction/src/main/java/org/apache/geode_examples/eviction}/Example.java (79%)
create mode 100644 expiration/README.md
copy {loader => expiration}/scripts/start.gfsh (84%)
mode change 100644 => 100755
copy {writer => expiration}/scripts/stop.gfsh (100%)
mode change 100644 => 100755
copy {listener/src/main/java/org/apache/geode_examples/listener =>
expiration/src/main/java/org/apache/geode_examples/expiration}/Example.java
(57%)
create mode 100644 indexes/README.md
copy {loader => indexes}/scripts/start.gfsh (82%)
copy {writer => indexes}/scripts/stop.gfsh (100%)
create mode 100644
indexes/src/main/java/org/apache/geode_examples/indexes/Example.java
copy
luceneSpatial/src/main/java/org/apache/geode_examples/luceneSpatial/TrainStop.java
=> indexes/src/main/java/org/apache/geode_examples/indexes/FlightCode.java
(51%)
create mode 100644
indexes/src/main/java/org/apache/geode_examples/indexes/Passenger.java
create mode 100644
indexes/src/main/java/org/apache/geode_examples/indexes/RegionPopulator.java
create mode 100644 serialization/README.md
copy {replicated => serialization}/scripts/start.gfsh (93%)
copy {functions => serialization}/scripts/stop.gfsh (96%)
create mode 100644
serialization/src/main/java/org/apache/geode_examples/serialization/Country.java
cre
[geode-examples] 01/01: Merge branch 'release/1.5.0'
This is an automated email from the ASF dual-hosted git repository.
sbawaskar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/geode-examples.git
commit fdd79ec48313914f4bcd2507230e55ab47f772a3
Merge: 5b413a3 4941f05
Author: Swapnil Bawaskar
AuthorDate: Fri Apr 6 14:01:45 2018 -0700
Merge branch 'release/1.5.0'
README.md | 40 ---
build.gradle | 44 +++-
clientSecurity/README.md | 3 +-
clientSecurity/example_security.properties | 6 ++
clientSecurity/keystore.jks| Bin 0 -> 515 bytes
clientSecurity/scripts/start.gfsh | 7 +-
clientSecurity/scripts/stop.gfsh | 4 +-
.../geode_examples/clientSecurity/Example.java | 5 +
clientSecurity/truststore.jks | Bin 0 -> 515 bytes
eviction/README.md | 53 +
gradle.properties => eviction/scripts/start.gfsh | 20 ++--
{clientSecurity => eviction}/scripts/stop.gfsh | 3 +-
.../apache/geode_examples/eviction/Example.java| 72 +
expiration/README.md | 54 ++
gradle.properties => expiration/scripts/start.gfsh | 21 ++--
{clientSecurity => expiration}/scripts/stop.gfsh | 3 +-
.../apache/geode_examples/expiration/Example.java | 88 +++
gradle.properties | 4 +-
indexes/README.md | 57 ++
gradle.properties => indexes/scripts/start.gfsh| 21 ++--
{clientSecurity => indexes}/scripts/stop.gfsh | 3 +-
.../org/apache/geode_examples/indexes/Example.java | 82 ++
.../apache/geode_examples/indexes/FlightCode.java | 54 ++
.../apache/geode_examples/indexes/Passenger.java | 66
.../geode_examples/indexes/RegionPopulator.java| 76 +
serialization/README.md| 61 +++
.../stop.gfsh => serialization/scripts/start.gfsh | 10 +-
.../scripts/stop.gfsh | 5 +-
.../geode_examples/serialization/Country.java | 118 +
.../geode_examples/serialization/Example.java | 107 +++
settings.gradle| 4 +
31 files changed, 1021 insertions(+), 70 deletions(-)
--
To stop receiving notification emails like this one, please contact
sbawas...@apache.org.
[geode] branch feature/GEODE_5027 updated: GEODE-5027 Bump version to 1.6.0
This is an automated email from the ASF dual-hosted git repository.
bschuchardt pushed a commit to branch feature/GEODE_5027
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/feature/GEODE_5027 by this
push:
new abf252d GEODE-5027 Bump version to 1.6.0
abf252d is described below
commit abf252d4b87001e01ee986a5766b172fd55f6349
Author: Bruce Schuchardt
AuthorDate: Fri Apr 6 14:07:34 2018 -0700
GEODE-5027 Bump version to 1.6.0
Revising the new VersionJUnitTest method - the old one made no sense
---
.../src/main/java/org/apache/geode/internal/Version.java | 7 +++
.../internal/cache/tier/sockets/CommandInitializer.java | 3 +++
.../java/org/apache/geode/internal/VersionJUnitTest.java | 12
3 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/geode-core/src/main/java/org/apache/geode/internal/Version.java
b/geode-core/src/main/java/org/apache/geode/internal/Version.java
index 5c67838..f7a01e7 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/Version.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/Version.java
@@ -20,6 +20,8 @@ import java.io.DataOutput;
import java.io.IOException;
import java.io.InputStream;
import java.nio.ByteBuffer;
+import java.util.Arrays;
+import java.util.stream.Collectors;
import org.apache.geode.cache.UnsupportedVersionException;
import org.apache.geode.internal.cache.tier.sockets.CommandInitializer;
@@ -544,4 +546,9 @@ public class Version implements Comparable {
public boolean isPre65() {
return compareTo(Version.GFE_65) < 0;
}
+
+ public static Iterable getAllVersions() {
+return Arrays.asList(VALUES).stream().filter(x -> x != null && x !=
TEST_VERSION)
+.collect(Collectors.toList());
+ }
}
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CommandInitializer.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CommandInitializer.java
index c0b7f99..8d2bb23 100644
---
a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CommandInitializer.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CommandInitializer.java
@@ -157,6 +157,8 @@ public class CommandInitializer {
private static void initializeAllCommands() {
ALL_COMMANDS = new LinkedHashMap>();
+ALL_COMMANDS.put(Version.GFE_56, new HashMap<>());
+
// Initialize the GFE 5.7 commands
Map gfe57Commands = new HashMap();
ALL_COMMANDS.put(Version.GFE_57, gfe57Commands);
@@ -293,6 +295,7 @@ public class CommandInitializer {
gfe70Commands.put(MessageType.EXECUTE_FUNCTION,
ExecuteFunction70.getCommand());
ALL_COMMANDS.put(Version.GFE_701, gfe70Commands);
+ALL_COMMANDS.put(Version.GFE_7099, gfe70Commands);
ALL_COMMANDS.put(Version.GFE_71, gfe70Commands);
Map gfe80Commands = new HashMap();
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/VersionJUnitTest.java
b/geode-core/src/test/java/org/apache/geode/internal/VersionJUnitTest.java
index 48572fc..36897e8 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/VersionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/VersionJUnitTest.java
@@ -62,9 +62,13 @@ public class VersionJUnitTest {
}
@Test
- public void testCommandMapContainsCurrentVersion() {
-org.junit.Assert.assertNotNull(
-"Please add a commnd set for the new version of Geode to
CommandInitializer",
-CommandInitializer.getCommands(Version.CURRENT));
+ public void testCommandMapContainsAllVersionsButCurrent() {
+for (Version version : Version.getAllVersions()) {
+ if (version != Version.CURRENT) {
+org.junit.Assert.assertNotNull(
+"Please add a commnd set for " + version + " of Geode to
CommandInitializer",
+CommandInitializer.getCommands(version));
+ }
+}
}
}
--
To stop receiving notification emails like this one, please contact
bschucha...@apache.org.
[geode-examples] branch release/1.5.0 deleted (was 4941f05)
This is an automated email from the ASF dual-hosted git repository. sbawaskar pushed a change to branch release/1.5.0 in repository https://gitbox.apache.org/repos/asf/geode-examples.git. was 4941f05 updated version in preparation of the release The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact sbawas...@apache.org.
[geode] branch release/1.5.0 deleted (was 1be57f3)
This is an automated email from the ASF dual-hosted git repository. sbawaskar pushed a change to branch release/1.5.0 in repository https://gitbox.apache.org/repos/asf/geode.git. was 1be57f3 GEODE-4913: gfsh start server cmd is not recognizing local properties... The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact sbawas...@apache.org.
[geode-site] branch asf-site updated: Hey Apache, please notice me!
This is an automated email from the ASF dual-hosted git repository. dbarnes pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/geode-site.git The following commit(s) were added to refs/heads/asf-site by this push: new e25e742 Hey Apache, please notice me! e25e742 is described below commit e25e7421d6710c606ad02976a85793e5f2f66a33 Author: Dave Barnes AuthorDate: Fri Apr 6 14:20:40 2018 -0700 Hey Apache, please notice me! --- index.html | 1 - 1 file changed, 1 deletion(-) diff --git a/index.html b/index.html index 78c9057..c9ce95f 100644 --- a/index.html +++ b/index.html @@ -1,6 +1,5 @@ -
[geode] 01/01: GEODE-4997: work in progress, document inline caching with Geode
This is an automated email from the ASF dual-hosted git repository. kmiller pushed a commit to branch feature/GEODE-4997 in repository https://gitbox.apache.org/repos/asf/geode.git commit 9b5c43e86194f990526de0d5073477bafb31adb1 Author: Karen Miller AuthorDate: Fri Apr 6 14:49:34 2018 -0700 GEODE-4997: work in progress, document inline caching with Geode --- geode-docs/use_cases/inline-cache.html.md.erb | 13 + 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/geode-docs/use_cases/inline-cache.html.md.erb b/geode-docs/use_cases/inline-cache.html.md.erb index 87e1e5b..1a2bab3 100644 --- a/geode-docs/use_cases/inline-cache.html.md.erb +++ b/geode-docs/use_cases/inline-cache.html.md.erb @@ -22,9 +22,13 @@ An inline cache holds region entries for a client application. ## Description of an Inline Cache -A cache is formed from a region within a <%=vars.product_name%> cluster, -and the cache sits between the client application and a +An inline cache holds data for quick access. +The inline cache comprises +a Geode region together with code deployed to servers that host +the region. +The inline cache sits between the client application and a backing data store. +The server-deployed code communicates with the backend data store. @@ -36,9 +40,10 @@ it quickly responds with the value for a lookup operation. This is a cache hit. If the requested region entry is not in the region, it is a cache miss, -and code that has been deployed to the server acquires the +and the code deployed to the server acquires the entry from the data store. -The acquired region entry is written to the region + writes the +acquired region entry to the region such that future lookups will cause a cache hit. ## Implementation and Configuration -- To stop receiving notification emails like this one, please contact kmil...@apache.org.
[geode] branch feature/GEODE-4997 created (now 9b5c43e)
This is an automated email from the ASF dual-hosted git repository. kmiller pushed a change to branch feature/GEODE-4997 in repository https://gitbox.apache.org/repos/asf/geode.git. at 9b5c43e GEODE-4997: work in progress, document inline caching with Geode This branch includes the following new commits: new 9b5c43e GEODE-4997: work in progress, document inline caching with Geode The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. -- To stop receiving notification emails like this one, please contact kmil...@apache.org.
[geode] branch develop updated: GEODE-4999: Added explicit tomcat 8.5 directory for tcserver support (#1737)
This is an automated email from the ASF dual-hosted git repository.
nnag pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new 2d45dad GEODE-4999: Added explicit tomcat 8.5 directory for tcserver
support (#1737)
2d45dad is described below
commit 2d45dad835d70e731ecc8053f75184f0dd0a9265
Author: Jason Huynh
AuthorDate: Fri Apr 6 15:16:58 2018 -0700
GEODE-4999: Added explicit tomcat 8.5 directory for tcserver support (#1737)
---
extensions/geode-modules-assembly/build.gradle| 19 +--
.../tcserver/geode-cs-tomcat-85/context-fragment.xml | 15 +++
.../tcserver/geode-p2p-tomcat-85/context-fragment.xml | 15 +++
settings.gradle | 1 +
4 files changed, 48 insertions(+), 2 deletions(-)
diff --git a/extensions/geode-modules-assembly/build.gradle
b/extensions/geode-modules-assembly/build.gradle
index 59398ce..c320f21 100644
--- a/extensions/geode-modules-assembly/build.gradle
+++ b/extensions/geode-modules-assembly/build.gradle
@@ -54,6 +54,7 @@ def configureTcServerAssembly = {
from getJarArtifact(':extensions/geode-modules')
from getJarArtifact(':extensions/geode-modules-tomcat7')
from getJarArtifact(':extensions/geode-modules-tomcat8')
+from getJarArtifact(':extensions/geode-modules-tomcat85')
from configurations.slf4jDeps
}
into('geode-cs/bin') {
@@ -87,6 +88,7 @@ def configureTcServerAssembly = {
from getJarArtifact(':extensions/geode-modules')
from getJarArtifact(':extensions/geode-modules-tomcat7')
from getJarArtifact(':extensions/geode-modules-tomcat8')
+from getJarArtifact(':extensions/geode-modules-tomcat85')
from configurations.slf4jDeps
}
into('geode-p2p/bin') {
@@ -128,11 +130,23 @@ def configureTcServer30Assembly = {
}
}
+ into('geode-cs-tomcat-85/conf') {
+from('release/tcserver/geode-cs-tomcat-85') {
+ include 'context-fragment.xml'
+}
+ }
+
into('geode-p2p-tomcat-8/conf') {
from('release/tcserver/geode-p2p-tomcat-8') {
include 'context-fragment.xml'
}
}
+
+ into('geode-p2p-tomcat-85/conf') {
+from('release/tcserver/geode-p2p-tomcat-85') {
+ include 'context-fragment.xml'
+}
+ }
}
task distTomcat(type: Zip, dependsOn: ':extensions/geode-modules:assemble') {
@@ -144,6 +158,7 @@ task distTomcat(type: Zip, dependsOn:
':extensions/geode-modules:assemble') {
from getJarArtifact(':extensions/geode-modules')
from getJarArtifact(':extensions/geode-modules-tomcat7')
from getJarArtifact(':extensions/geode-modules-tomcat8')
+from getJarArtifact(':extensions/geode-modules-tomcat85')
from configurations.slf4jDeps
}
into('bin') {
@@ -192,11 +207,11 @@ task distAppServer(type: Zip, dependsOn:
':extensions/geode-modules-session:asse
}
}
-task distTcServer(type: Zip, dependsOn: [':extensions/geode-modules:assemble',
':extensions/geode-modules-tomcat7:assemble',
':extensions/geode-modules-tomcat8:assemble'] ) {
+task distTcServer(type: Zip, dependsOn: [':extensions/geode-modules:assemble',
':extensions/geode-modules-tomcat7:assemble',
':extensions/geode-modules-tomcat8:assemble',
':extensions/geode-modules-tomcat85:assemble'] ) {
configure(configureTcServerAssembly)
}
-task distTcServer30(type: Zip, dependsOn:
[':extensions/geode-modules:assemble',
':extensions/geode-modules-tomcat7:assemble',
':extensions/geode-modules-tomcat8:assemble']) {
+task distTcServer30(type: Zip, dependsOn:
[':extensions/geode-modules:assemble',
':extensions/geode-modules-tomcat7:assemble',
':extensions/geode-modules-tomcat8:assemble',
':extensions/geode-modules-tomcat85:assemble']) {
configure(configureTcServerAssembly)
configure(configureTcServer30Assembly)
}
diff --git
a/extensions/geode-modules-assembly/release/tcserver/geode-cs-tomcat-85/context-fragment.xml
b/extensions/geode-modules-assembly/release/tcserver/geode-cs-tomcat-85/context-fragment.xml
new file mode 100644
index 000..c8ff83d
--- /dev/null
+++
b/extensions/geode-modules-assembly/release/tcserver/geode-cs-tomcat-85/context-fragment.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
diff --git
a/extensions/geode-modules-assembly/release/tcserver/geode-p2p-tomcat-85/context-fragment.xml
b/extensions/geode-modules-assembly/release/tcserver/geode-p2p-tomcat-85/context-fragment.xml
new file mode 100644
index 000..48bfcbb
--- /dev/null
+++
b/extensions/geode-modules-assembly/release/tcserver/geode-p2p-tomcat-85/context-fragment.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
diff --git a/settings.gradle b/settings.gradle
index 74c1811..3c03aca 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -34,6 +34,7 @@ include 'geode-connectors'
include 'extensions/geode-modules'
include 'extensions/geode-modules-tomcat7'
include 'extensions/geode-modules-tomcat8'
+include '
[geode] branch feature/GEODE_5027 updated: GEODE-5027 Bump version to 1.6.0
This is an automated email from the ASF dual-hosted git repository.
bschuchardt pushed a commit to branch feature/GEODE_5027
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/feature/GEODE_5027 by this
push:
new dacc759 GEODE-5027 Bump version to 1.6.0
dacc759 is described below
commit dacc759b31671cc4335ae7808cb81c7dcb190662
Author: Bruce Schuchardt
AuthorDate: Fri Apr 6 15:43:05 2018 -0700
GEODE-5027 Bump version to 1.6.0
adding the command set for 1.6.0
---
.../internal/cache/tier/sockets/CommandInitializer.java | 1 +
.../java/org/apache/geode/internal/VersionJUnitTest.java | 16 ++--
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CommandInitializer.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CommandInitializer.java
index 8d2bb23..bb666ac 100644
---
a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CommandInitializer.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CommandInitializer.java
@@ -327,6 +327,7 @@ public class CommandInitializer {
ALL_COMMANDS.put(Version.GEODE_130, commands);
ALL_COMMANDS.put(Version.GEODE_140, commands);
ALL_COMMANDS.put(Version.GEODE_150, commands);
+ALL_COMMANDS.put(Version.GEODE_160, commands);
}
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/VersionJUnitTest.java
b/geode-core/src/test/java/org/apache/geode/internal/VersionJUnitTest.java
index 36897e8..3ce3736 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/VersionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/VersionJUnitTest.java
@@ -20,6 +20,7 @@ import static org.junit.Assert.assertTrue;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.cache.UnsupportedVersionException;
import org.apache.geode.internal.cache.tier.sockets.CommandInitializer;
import org.apache.geode.test.junit.categories.UnitTest;
@@ -62,13 +63,16 @@ public class VersionJUnitTest {
}
@Test
- public void testCommandMapContainsAllVersionsButCurrent() {
+ public void testCommandMapContainsAllVersions() {
for (Version version : Version.getAllVersions()) {
- if (version != Version.CURRENT) {
-org.junit.Assert.assertNotNull(
-"Please add a commnd set for " + version + " of Geode to
CommandInitializer",
-CommandInitializer.getCommands(version));
- }
+ org.junit.Assert.assertNotNull(
+ "Please add a commnd set for " + version + " of Geode to
CommandInitializer",
+ CommandInitializer.getCommands(version));
}
}
+
+ @Test
+ public void testFromOrdinalForCurrentVersionSucceeds() throws
UnsupportedVersionException {
+Version.fromOrdinal(Version.CURRENT_ORDINAL, true);
+ }
}
--
To stop receiving notification emails like this one, please contact
bschucha...@apache.org.
[geode-native] branch develop updated: GEODE-4994: Fix windows compilation (#266)
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode-native.git
The following commit(s) were added to refs/heads/develop by this push:
new e4795be GEODE-4994: Fix windows compilation (#266)
e4795be is described below
commit e4795bebce105eed1aca8ceeb8cd747a0c10b09a
Author: Ryan McMahon
AuthorDate: Fri Apr 6 16:17:26 2018 -0700
GEODE-4994: Fix windows compilation (#266)
* GEODE-4994: Fix windows compilation
Signed-off-by: Ryan McMahon
Signed-off-by: Michael Oleske
---
.../integration-test/testXmlCacheCreationWithPools.cpp | 9 +
cryptoimpl/DHImpl.cpp | 9 +
dhimpl/DHImpl.cpp | 3 +--
tests/cpp/testobject/BatchObject.hpp| 15 ---
tests/cpp/testobject/DeltaFastAssetAccount.hpp | 10 --
tests/cpp/testobject/DeltaPSTObject.hpp | 17 +
tests/cpp/testobject/EqStruct.hpp | 15 ---
tests/cpp/testobject/PSTObject.hpp | 15 ---
8 files changed, 44 insertions(+), 49 deletions(-)
diff --git a/cppcache/integration-test/testXmlCacheCreationWithPools.cpp
b/cppcache/integration-test/testXmlCacheCreationWithPools.cpp
index d4f64c0..18be4bf 100644
--- a/cppcache/integration-test/testXmlCacheCreationWithPools.cpp
+++ b/cppcache/integration-test/testXmlCacheCreationWithPools.cpp
@@ -15,15 +15,16 @@
* limitations under the License.
*/
-#include
+#include
+#include
#include
+#include
#include
-#include
-
-#include "fw_dunit.hpp"
#include
+#include "fw_dunit.hpp"
+
#define CLIENT1 s1p1
#define SERVER1 s2p1
#define SERVER2 s2p2
diff --git a/cryptoimpl/DHImpl.cpp b/cryptoimpl/DHImpl.cpp
index 32a65eb..0017774 100644
--- a/cryptoimpl/DHImpl.cpp
+++ b/cryptoimpl/DHImpl.cpp
@@ -99,35 +99,29 @@ ASN1_SEQUENCE(
dhimpl->m_dh = DH_new();
-
const BIGNUM *pbn, *gbn;
DH_get0_pqg(dhimpl->m_dh, &pbn, NULL, &gbn);
BN_dec2bn((BIGNUM **)&pbn, dhP);
- LOGDH(" DHInit: BN_dec2bn dhP ret %d", ret);
LOGDH(" DHInit: P ptr is %p", pbn);
LOGDH(" DHInit: G ptr is %p", gbn);
LOGDH(" DHInit: length is %d", DH_get_length(dhimpl->m_dh));
BN_dec2bn((BIGNUM **)&gbn, dhG);
- LOGDH(" DHInit: BN_dec2bn dhG ret %d", ret);
DH_set_length(dhimpl->m_dh, dhL);
DH_generate_key(dhimpl->m_dh);
- LOGDH(" DHInit: DH_generate_key ret %d", ret);
const BIGNUM *pub_key, *priv_key;
DH_get0_key(dhimpl->m_dh, &pub_key, &priv_key);
BN_num_bits(priv_key);
- LOGDH(" DHInit: BN_num_bits priv_key is %d", ret);
BN_num_bits(pub_key);
- LOGDH(" DHInit: BN_num_bits pub_key is %d", ret);
int codes = 0;
DH_check(dhimpl->m_dh, &codes);
- LOGDH(" DHInit: DH_check ret %d : codes is 0x%04X", ret, codes);
+ LOGDH(" DHInit: DH_check codes is 0x%04X", codes);
LOGDH(" DHInit: DH_size is %d", DH_size(dhimpl->m_dh));
// load the server's RSA public key for server authentication
@@ -371,7 +365,6 @@ unsigned char *gf_encryptDH(void *dhCtx, const unsigned
char *cleartext,
int keySize = dhimpl->m_keySize > 128 ? dhimpl->m_keySize / 8 : 16;
EVP_EncryptInit_ex(ctx, cipherFunc, NULL, NULL,
(unsigned char *)dhimpl->m_key + keySize);
-LOGDH("DHencrypt: init BF ret %d", ret);
EVP_CIPHER_CTX_set_key_length(ctx, keySize);
LOGDH("DHencrypt: BF keysize is %d", keySize);
EVP_EncryptInit_ex(ctx, NULL, NULL, (unsigned char *)dhimpl->m_key, NULL);
diff --git a/dhimpl/DHImpl.cpp b/dhimpl/DHImpl.cpp
index 44c2316..e8a15c3 100644
--- a/dhimpl/DHImpl.cpp
+++ b/dhimpl/DHImpl.cpp
@@ -100,7 +100,7 @@ ASN1_SEQUENCE(
int codes = 0;
DH_check(m_dh, &codes);
- LOGDH(" DHInit: DH_check ret %d : codes is 0x%04X", ret, codes);
+ LOGDH(" DHInit: DH_check codes is 0x%04X", codes);
LOGDH(" DHInit: DH_size is %d", DH_size(m_dh));
// load the server's RSA public key for server authentication
@@ -336,7 +336,6 @@ unsigned char *gf_encryptDH(const unsigned char *cleartext,
int len,
int keySize = m_keySize > 128 ? m_keySize / 8 : 16;
EVP_EncryptInit_ex(ctx, cipherFunc, NULL, NULL,
(unsigned char *)m_key + keySize);
-LOGDH("DHencrypt: init BF ret %d", ret);
EVP_CIPHER_CTX_set_key_length(ctx, keySize);
LOGDH("DHencrypt: BF keysize is %d", keySize);
EVP_EncryptInit_ex(ctx, NULL, NULL, (unsigned char *)m_key, NULL);
diff --git a/tests/cpp/testobject/BatchObject.hpp
b/tests/cpp/testobject/BatchObject.hpp
index d73c3b0..32c05d0 100644
--- a/tests/cpp/testobject/BatchObject.hpp
+++ b/tests/cpp/testobject/BatchObject.hpp
@@ -20,23 +20,24 @@
#ifndef GEODE_TESTOBJECT_BATCHOBJECT_H_
#define GEODE_TESTOBJECT_BATCHOBJECT_H_
-/*
- * @brief User class for testing the cq functionality.
- */
-
+#include
#include
-#include "fwklib/Tim
[geode] branch develop updated: Revert "GEODE-4999: Added explicit tomcat 8.5 directory for tcserver support (#1737)"
This is an automated email from the ASF dual-hosted git repository.
nnag pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new f6f58d3 Revert "GEODE-4999: Added explicit tomcat 8.5 directory for
tcserver support (#1737)"
f6f58d3 is described below
commit f6f58d389492b1cdabde1d2442dc3067278cda3b
Author: nabarun
AuthorDate: Fri Apr 6 16:24:13 2018 -0700
Revert "GEODE-4999: Added explicit tomcat 8.5 directory for tcserver
support (#1737)"
This reverts commit 2d45dad835d70e731ecc8053f75184f0dd0a9265.
---
extensions/geode-modules-assembly/build.gradle| 19 ++-
.../tcserver/geode-cs-tomcat-85/context-fragment.xml | 15 ---
.../tcserver/geode-p2p-tomcat-85/context-fragment.xml | 15 ---
settings.gradle | 1 -
4 files changed, 2 insertions(+), 48 deletions(-)
diff --git a/extensions/geode-modules-assembly/build.gradle
b/extensions/geode-modules-assembly/build.gradle
index c320f21..59398ce 100644
--- a/extensions/geode-modules-assembly/build.gradle
+++ b/extensions/geode-modules-assembly/build.gradle
@@ -54,7 +54,6 @@ def configureTcServerAssembly = {
from getJarArtifact(':extensions/geode-modules')
from getJarArtifact(':extensions/geode-modules-tomcat7')
from getJarArtifact(':extensions/geode-modules-tomcat8')
-from getJarArtifact(':extensions/geode-modules-tomcat85')
from configurations.slf4jDeps
}
into('geode-cs/bin') {
@@ -88,7 +87,6 @@ def configureTcServerAssembly = {
from getJarArtifact(':extensions/geode-modules')
from getJarArtifact(':extensions/geode-modules-tomcat7')
from getJarArtifact(':extensions/geode-modules-tomcat8')
-from getJarArtifact(':extensions/geode-modules-tomcat85')
from configurations.slf4jDeps
}
into('geode-p2p/bin') {
@@ -130,23 +128,11 @@ def configureTcServer30Assembly = {
}
}
- into('geode-cs-tomcat-85/conf') {
-from('release/tcserver/geode-cs-tomcat-85') {
- include 'context-fragment.xml'
-}
- }
-
into('geode-p2p-tomcat-8/conf') {
from('release/tcserver/geode-p2p-tomcat-8') {
include 'context-fragment.xml'
}
}
-
- into('geode-p2p-tomcat-85/conf') {
-from('release/tcserver/geode-p2p-tomcat-85') {
- include 'context-fragment.xml'
-}
- }
}
task distTomcat(type: Zip, dependsOn: ':extensions/geode-modules:assemble') {
@@ -158,7 +144,6 @@ task distTomcat(type: Zip, dependsOn:
':extensions/geode-modules:assemble') {
from getJarArtifact(':extensions/geode-modules')
from getJarArtifact(':extensions/geode-modules-tomcat7')
from getJarArtifact(':extensions/geode-modules-tomcat8')
-from getJarArtifact(':extensions/geode-modules-tomcat85')
from configurations.slf4jDeps
}
into('bin') {
@@ -207,11 +192,11 @@ task distAppServer(type: Zip, dependsOn:
':extensions/geode-modules-session:asse
}
}
-task distTcServer(type: Zip, dependsOn: [':extensions/geode-modules:assemble',
':extensions/geode-modules-tomcat7:assemble',
':extensions/geode-modules-tomcat8:assemble',
':extensions/geode-modules-tomcat85:assemble'] ) {
+task distTcServer(type: Zip, dependsOn: [':extensions/geode-modules:assemble',
':extensions/geode-modules-tomcat7:assemble',
':extensions/geode-modules-tomcat8:assemble'] ) {
configure(configureTcServerAssembly)
}
-task distTcServer30(type: Zip, dependsOn:
[':extensions/geode-modules:assemble',
':extensions/geode-modules-tomcat7:assemble',
':extensions/geode-modules-tomcat8:assemble',
':extensions/geode-modules-tomcat85:assemble']) {
+task distTcServer30(type: Zip, dependsOn:
[':extensions/geode-modules:assemble',
':extensions/geode-modules-tomcat7:assemble',
':extensions/geode-modules-tomcat8:assemble']) {
configure(configureTcServerAssembly)
configure(configureTcServer30Assembly)
}
diff --git
a/extensions/geode-modules-assembly/release/tcserver/geode-cs-tomcat-85/context-fragment.xml
b/extensions/geode-modules-assembly/release/tcserver/geode-cs-tomcat-85/context-fragment.xml
deleted file mode 100644
index c8ff83d..000
---
a/extensions/geode-modules-assembly/release/tcserver/geode-cs-tomcat-85/context-fragment.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
-
-
-
diff --git
a/extensions/geode-modules-assembly/release/tcserver/geode-p2p-tomcat-85/context-fragment.xml
b/extensions/geode-modules-assembly/release/tcserver/geode-p2p-tomcat-85/context-fragment.xml
deleted file mode 100644
index 48bfcbb..000
---
a/extensions/geode-modules-assembly/release/tcserver/geode-p2p-tomcat-85/context-fragment.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/settings.gradle b/settings.gradle
index 3c03aca..74c1811 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -34,7 +34,6 @@ include 'geode-connectors'
include 'extensions/geode-modules'
inc
[geode-site] branch master updated: Modernized some link URLs at Apache’s request
This is an automated email from the ASF dual-hosted git repository. dbarnes pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/geode-site.git The following commit(s) were added to refs/heads/master by this push: new 00bf547 Modernized some link URLs at Apache’s request 00bf547 is described below commit 00bf547cbfd2e2b7d16d5b4752533c043b341ce5 Author: Dave Barnes AuthorDate: Fri Apr 6 16:39:05 2018 -0700 Modernized some link URLs at Apache’s request --- website/content/releases/index.html | 100 ++-- 1 file changed, 50 insertions(+), 50 deletions(-) diff --git a/website/content/releases/index.html b/website/content/releases/index.html index ff65490..9374fb8 100644 --- a/website/content/releases/index.html +++ b/website/content/releases/index.html @@ -43,27 +43,27 @@ under the License. --> Binaries - [ http://apache.org/dyn/closer.cgi/geode/1.5.0/apache-geode-1.5.0.zip";>ZIP, https://dist.apache.org/repos/dist/release/geode/1.5.0/apache-geode-1.5.0.zip.sha256";>SHA-256, - https://dist.apache.org/repos/dist/release/geode/1.5.0/apache-geode-1.5.0.zip.asc";>PGP ] - - [http://apache.org/dyn/closer.cgi/geode/1.5.0/apache-geode-1.5.0.tgz";>TGZ, https://dist.apache.org/repos/dist/release/geode/1.5.0/apache-geode-1.5.0.tgz.sha256";>SHA-256, - https://dist.apache.org/repos/dist/release/geode/1.5.0/apache-geode-1.5.0.tgz.asc";>PGP ] + [ http://apache.org/dyn/closer.cgi/geode/1.5.0/apache-geode-1.5.0.zip";>ZIP, https://www.apache.org/dist/geode/1.5.0/apache-geode-1.5.0.zip.sha256";>SHA-256, + https://www.apache.org/dist/geode/1.5.0/apache-geode-1.5.0.zip.asc";>PGP ] - + [http://apache.org/dyn/closer.cgi/geode/1.5.0/apache-geode-1.5.0.tgz";>TGZ, https://www.apache.org/dist/geode/1.5.0/apache-geode-1.5.0.tgz.sha256";>SHA-256, + https://www.apache.org/dist/geode/1.5.0/apache-geode-1.5.0.tgz.asc";>PGP ] Source - [ http://apache.org/dyn/closer.cgi/geode/1.5.0/apache-geode-1.5.0-src.zip";>ZIP, https://dist.apache.org/repos/dist/release/geode/1.5.0/apache-geode-1.5.0-src.zip.sha256";>SHA-256, - https://dist.apache.org/repos/dist/release/geode/1.5.0/apache-geode-1.5.0-src.zip.asc";>PGP + [ http://apache.org/dyn/closer.cgi/geode/1.5.0/apache-geode-1.5.0-src.zip";>ZIP, https://www.apache.org/dist/geode/1.5.0/apache-geode-1.5.0-src.zip.sha256";>SHA-256, + https://www.apache.org/dist/geode/1.5.0/apache-geode-1.5.0-src.zip.asc";>PGP ] - - [http://apache.org/dyn/closer.cgi/geode/1.5.0/apache-geode-1.5.0-src.tgz";>TGZ, https://dist.apache.org/repos/dist/release/geode/1.5.0/apache-geode-1.5.0-src.tgz.sha256";>SHA-256, - https://dist.apache.org/repos/dist/release/geode/1.5.0/apache-geode-1.5.0-src.tgz.asc";>PGP + [http://apache.org/dyn/closer.cgi/geode/1.5.0/apache-geode-1.5.0-src.tgz";>TGZ, https://www.apache.org/dist/geode/1.5.0/apache-geode-1.5.0-src.tgz.sha256";>SHA-256, + https://www.apache.org/dist/geode/1.5.0/apache-geode-1.5.0-src.tgz.asc";>PGP ] Examples - [ http://apache.org/dyn/closer.cgi/geode/1.5.0/apache-geode-examples-1.5.0.zip";>ZIP, https://dist.apache.org/repos/dist/release/geode/1.5.0/apache-geode-examples-1.5.0.zip.sha256";>SHA-256, - https://dist.apache.org/repos/dist/release/geode/1.5.0/apache-geode-examples-1.5.0.zip.asc";>PGP + [ http://apache.org/dyn/closer.cgi/geode/1.5.0/apache-geode-examples-1.5.0.zip";>ZIP, https://www.apache.org/dist/geode/1.5.0/apache-geode-examples-1.5.0.zip.sha256";>SHA-256, + https://www.apache.org/dist/geode/1.5.0/apache-geode-examples-1.5.0.zip.asc";>PGP ] - - [http://apache.org/dyn/closer.cgi/geode/1.5.0/apache-geode-examples-1.5.0.tar.gz";>TAR.GZ, https://dist.apache.org/repos/dist/release/geode/1.5.0/apache-geode-examples-1.5.0.tar.gz.sha256";>SHA-256, - https://dist.apache.org/repos/dist/release/geode/1.5.0/apache-geode-examples-1.5.0.tar.gz.asc";>PGP + [http://apache.org/dyn/closer.cgi/geode/1.5.0/apache-geode-examples-1.5.0.tar.gz";>TAR.GZ, https://www.apache.org/dist/geode/1.5.0/apache-geode-examples-1.5.0.tar.gz.sha256";>SHA-256, + https://www.apache.org/dist/geode/1.5.0/apache-geode-examples-1.5.0.tar.gz.asc";>PGP ] @@ -96,27 +96,27 @@ under the License. --> Binaries - [ http://apache.org/dyn/closer.cgi/geode/1.4.0/apache-geode-1.4.0.zip";>ZIP, https://dist.apache.org/repos/dist/release/geode/1.4.0/apache-geode-1.4.0.zip.sha256";>SHA-256, - https://dist.apache.org/repos/dist/release/geode/1.4.0/apache-geode-1.4.0.zip.asc";>PGP ] - - [http://apache.org/dyn/closer.cgi/geode/1.4.0/apache-geode-1.4.0.tgz";>TGZ, https://dist.apache.org/repos/dist/release/geod
[geode-site] branch asf-site updated: Deploy modernized links
This is an automated email from the ASF dual-hosted git repository. dbarnes pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/geode-site.git The following commit(s) were added to refs/heads/asf-site by this push: new 0ccf6df Deploy modernized links 0ccf6df is described below commit 0ccf6dff7c131624e3280ee02ba22832c5a4fe2e Author: Dave Barnes AuthorDate: Fri Apr 6 16:43:12 2018 -0700 Deploy modernized links --- index.html | 1 + releases/index.html | 100 ++-- 2 files changed, 51 insertions(+), 50 deletions(-) diff --git a/index.html b/index.html index c9ce95f..78c9057 100644 --- a/index.html +++ b/index.html @@ -1,5 +1,6 @@ + Binaries - [ http://apache.org/dyn/closer.cgi/geode/1.5.0/apache-geode-1.5.0.zip";>ZIP, https://dist.apache.org/repos/dist/release/geode/1.5.0/apache-geode-1.5.0.zip.sha256";>SHA-256, - https://dist.apache.org/repos/dist/release/geode/1.5.0/apache-geode-1.5.0.zip.asc";>PGP ] - - [http://apache.org/dyn/closer.cgi/geode/1.5.0/apache-geode-1.5.0.tgz";>TGZ, https://dist.apache.org/repos/dist/release/geode/1.5.0/apache-geode-1.5.0.tgz.sha256";>SHA-256, - https://dist.apache.org/repos/dist/release/geode/1.5.0/apache-geode-1.5.0.tgz.asc";>PGP ] + [ http://apache.org/dyn/closer.cgi/geode/1.5.0/apache-geode-1.5.0.zip";>ZIP, https://www.apache.org/dist/geode/1.5.0/apache-geode-1.5.0.zip.sha256";>SHA-256, + https://www.apache.org/dist/geode/1.5.0/apache-geode-1.5.0.zip.asc";>PGP ] - + [http://apache.org/dyn/closer.cgi/geode/1.5.0/apache-geode-1.5.0.tgz";>TGZ, https://www.apache.org/dist/geode/1.5.0/apache-geode-1.5.0.tgz.sha256";>SHA-256, + https://www.apache.org/dist/geode/1.5.0/apache-geode-1.5.0.tgz.asc";>PGP ] Source - [ http://apache.org/dyn/closer.cgi/geode/1.5.0/apache-geode-1.5.0-src.zip";>ZIP, https://dist.apache.org/repos/dist/release/geode/1.5.0/apache-geode-1.5.0-src.zip.sha256";>SHA-256, - https://dist.apache.org/repos/dist/release/geode/1.5.0/apache-geode-1.5.0-src.zip.asc";>PGP + [ http://apache.org/dyn/closer.cgi/geode/1.5.0/apache-geode-1.5.0-src.zip";>ZIP, https://www.apache.org/dist/geode/1.5.0/apache-geode-1.5.0-src.zip.sha256";>SHA-256, + https://www.apache.org/dist/geode/1.5.0/apache-geode-1.5.0-src.zip.asc";>PGP ] - - [http://apache.org/dyn/closer.cgi/geode/1.5.0/apache-geode-1.5.0-src.tgz";>TGZ, https://dist.apache.org/repos/dist/release/geode/1.5.0/apache-geode-1.5.0-src.tgz.sha256";>SHA-256, - https://dist.apache.org/repos/dist/release/geode/1.5.0/apache-geode-1.5.0-src.tgz.asc";>PGP + [http://apache.org/dyn/closer.cgi/geode/1.5.0/apache-geode-1.5.0-src.tgz";>TGZ, https://www.apache.org/dist/geode/1.5.0/apache-geode-1.5.0-src.tgz.sha256";>SHA-256, + https://www.apache.org/dist/geode/1.5.0/apache-geode-1.5.0-src.tgz.asc";>PGP ] Examples - [ http://apache.org/dyn/closer.cgi/geode/1.5.0/apache-geode-examples-1.5.0.zip";>ZIP, https://dist.apache.org/repos/dist/release/geode/1.5.0/apache-geode-examples-1.5.0.zip.sha256";>SHA-256, - https://dist.apache.org/repos/dist/release/geode/1.5.0/apache-geode-examples-1.5.0.zip.asc";>PGP + [ http://apache.org/dyn/closer.cgi/geode/1.5.0/apache-geode-examples-1.5.0.zip";>ZIP, https://www.apache.org/dist/geode/1.5.0/apache-geode-examples-1.5.0.zip.sha256";>SHA-256, + https://www.apache.org/dist/geode/1.5.0/apache-geode-examples-1.5.0.zip.asc";>PGP ] - - [http://apache.org/dyn/closer.cgi/geode/1.5.0/apache-geode-examples-1.5.0.tar.gz";>TAR.GZ, https://dist.apache.org/repos/dist/release/geode/1.5.0/apache-geode-examples-1.5.0.tar.gz.sha256";>SHA-256, - https://dist.apache.org/repos/dist/release/geode/1.5.0/apache-geode-examples-1.5.0.tar.gz.asc";>PGP + [http://apache.org/dyn/closer.cgi/geode/1.5.0/apache-geode-examples-1.5.0.tar.gz";>TAR.GZ, https://www.apache.org/dist/geode/1.5.0/apache-geode-examples-1.5.0.tar.gz.sha256";>SHA-256, + https://www.apache.org/dist/geode/1.5.0/apache-geode-examples-1.5.0.tar.gz.asc";>PGP ] @@ -187,27 +187,27 @@ under the License. --> Binaries - [ http://apache.org/dyn/closer.cgi/geode/1.4.0/apache-geode-1.4.0.zip";>ZIP, https://dist.apache.org/repos/dist/release/geode/1.4.0/apache-geode-1.4.0.zip.sha256";>SHA-256, - https://dist.apache.org/repos/dist/release/geode/1.4.0/apache-geode-1.4.0.zip.asc";>PGP ] - - [http://apache.org/dyn/closer.cgi/geode/1.4.0/apache-geode-1.4.0.tgz";>TGZ, https://dist.apache.org/repos/dist/release/geode/1.4.0/apache-geode-1.4.0.tgz.sha256";>SHA-256, - https://dist.apache.org/repos/dist/release/geode/1.4.0/apache-ge
[geode-native] branch develop updated: GEODE-3993: Remove poolName from DataInput/Output (#261)
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode-native.git
The following commit(s) were added to refs/heads/develop by this push:
new 95303fc GEODE-3993: Remove poolName from DataInput/Output (#261)
95303fc is described below
commit 95303fca05ec88a3d83f40dc21735d73f5e67717
Author: M. Oleske
AuthorDate: Fri Apr 6 23:43:19 2018 -0700
GEODE-3993: Remove poolName from DataInput/Output (#261)
* Remove default parameter from DataInput/DataOutput ctors
* Removes default constructor from DataOutput.
* Replace poolname with pool.
* Replaced iPUF with ignorePdxUnreadFields.
---
clicache/src/DataInput.cpp | 4 +-
clicache/src/DataInput.hpp | 2 +-
clicache/src/DataOutput.cpp| 4 +-
clicache/src/DataOutput.hpp| 2 +-
clicache/src/Serializable.cpp | 13 +++--
clicache/src/Serializable.hpp | 4 +-
clicache/src/impl/PdxHelper.cpp| 12 ++--
clicache/src/impl/PdxTypeRegistry.cpp | 8 +--
clicache/src/impl/PdxTypeRegistry.hpp | 4 +-
cppcache/include/geode/CacheableBuiltins.hpp | 15 +++--
cppcache/include/geode/DataInput.hpp | 46 ++--
cppcache/include/geode/DataOutput.hpp | 37 +
cppcache/include/geode/ExceptionTypes.hpp | 6 +-
cppcache/include/geode/PdxWrapper.hpp | 1 -
cppcache/include/geode/Serializer.hpp | 10 ++--
cppcache/integration-test/testSerialization.cpp| 2 +-
cppcache/src/Cache.cpp | 9 ++-
cppcache/src/CacheImpl.cpp | 64 +++---
cppcache/src/CacheImpl.hpp | 21 ---
cppcache/src/CacheableEnum.cpp | 2 +-
cppcache/src/CacheableObjectArray.cpp | 2 +-
cppcache/src/CacheableObjectPartList.cpp | 2 +-
cppcache/src/ClientProxyMembershipID.cpp | 4 +-
cppcache/src/CqService.hpp | 7 ++-
cppcache/src/DataInput.cpp | 9 +++
cppcache/src/DataInputInternal.hpp | 17 ++
cppcache/src/DataOutput.cpp| 7 +--
cppcache/src/DataOutputInternal.hpp| 20 +++
cppcache/src/EventId.cpp | 4 +-
cppcache/src/ExpMapEntry.hpp | 4 +-
cppcache/src/FarSideEntryOp.cpp| 6 +-
cppcache/src/LRUEntriesMap.hpp | 4 +-
cppcache/src/LRUExpMapEntry.hpp| 6 +-
cppcache/src/LRUMapEntry.hpp | 4 +-
cppcache/src/MapEntry.hpp | 2 +-
cppcache/src/PdxHelper.cpp | 22 +++-
cppcache/src/PdxType.cpp | 2 +-
cppcache/src/PdxTypeRegistry.cpp | 11 ++--
cppcache/src/PdxTypeRegistry.hpp | 5 +-
cppcache/src/PoolManagerImpl.cpp | 2 +-
cppcache/src/PreservedDataExpiryHandler.hpp| 3 +-
cppcache/src/Properties.cpp| 2 +-
.../src/PutAllPartialResultServerException.hpp | 3 +-
cppcache/src/RegionAttributes.cpp | 2 +-
cppcache/src/SerializationRegistry.cpp | 34 +++-
cppcache/src/SerializationRegistry.hpp | 8 ++-
cppcache/src/Struct.cpp| 6 +-
cppcache/src/TXCommitMessage.cpp | 4 +-
cppcache/src/TcrMessage.cpp| 34 ++--
cppcache/src/TcrMessage.hpp| 2 +-
cppcache/src/ThinClientRegion.cpp | 58 ++--
cppcache/src/VersionedCacheableObjectPartList.cpp | 4 +-
cppcache/src/statistics/HostStatSampler.hpp| 4 +-
cppcache/src/statistics/StatArchiveWriter.hpp | 6 +-
cppcache/src/util/exception.hpp| 2 +-
cppcache/test/DataInputTest.cpp| 17 +-
cppcache/test/TcrMessage_unittest.cpp | 3 +-
tests/cli/QueryHelper/CMakeLists.txt | 1 +
tests/cli/QueryHelper/QueryStringsM.cpp| 8 +--
59 files changed, 295 insertions(+), 312 deletions(-)
diff --git a/clicache/src/DataInput.cpp b/clicache/src/DataInput.cpp
index 0fedeec..58184cd 100644
--- a/clicache/src/DataInput.cpp
+++ b/clicache/src/DataInput.cpp
@@ -1164,11 +1164,11 @@ namespace Apache
}
}
- String^ DataInput::GetPoolName()
+ native::Pool* DataInput::GetPool()
{
try
{
- return
marshal_as(native::DataInputInternal::getPoolName(*m_nativeptr));
+ return native::DataInputInternal::getPool(*m_nativeptr);
}
finally {
GC::KeepA
