[geode] branch feature/GEODE-6149 updated (9a906db -> 7046ba4)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-6149 in repository https://gitbox.apache.org/repos/asf/geode.git. discard 9a906db GEODE-6149: when client's cache is closing, its GetClientPRMetaDataOp could end up with NPE add 7046ba4 GEODE-6149: when client's cache is closing, its GetClientPRMetaDataOp could end up with NPE This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (9a906db) \ N -- N -- N refs/heads/feature/GEODE-6149 (7046ba4) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../geode/cache/client/internal/GetClientPRMetaDataOp.java | 9 +++-- .../cache/client/internal/GetClientPRMetaDataOpJUnitTest.java| 4 2 files changed, 7 insertions(+), 6 deletions(-)
svn commit: r31383 - /dev/geode/1.8.0.RC2/
Author: amurmann Date: Thu Dec 6 02:00:49 2018 New Revision: 31383 Log: Adding resources for 2nd Geode 1.8.0 release candidate Added: dev/geode/1.8.0.RC2/ dev/geode/1.8.0.RC2/apache-geode-1.8.0-src.tgz (with props) dev/geode/1.8.0.RC2/apache-geode-1.8.0-src.tgz.asc dev/geode/1.8.0.RC2/apache-geode-1.8.0-src.tgz.sha256 dev/geode/1.8.0.RC2/apache-geode-1.8.0.tgz (with props) dev/geode/1.8.0.RC2/apache-geode-1.8.0.tgz.asc dev/geode/1.8.0.RC2/apache-geode-1.8.0.tgz.sha256 dev/geode/1.8.0.RC2/apache-geode-examples-1.8.0.tar.gz (with props) dev/geode/1.8.0.RC2/apache-geode-examples-1.8.0.tar.gz.asc dev/geode/1.8.0.RC2/apache-geode-examples-1.8.0.tar.gz.sha256 dev/geode/1.8.0.RC2/apache-geode-examples-1.8.0.zip (with props) dev/geode/1.8.0.RC2/apache-geode-examples-1.8.0.zip.asc dev/geode/1.8.0.RC2/apache-geode-examples-1.8.0.zip.sha256 dev/geode/1.8.0.RC2/apache-geode-native-1.8.0-Source.tar.gz (with props) dev/geode/1.8.0.RC2/apache-geode-native-1.8.0-Source.tar.gz.asc dev/geode/1.8.0.RC2/apache-geode-native-1.8.0-Source.tar.gz.sha512 Added: dev/geode/1.8.0.RC2/apache-geode-1.8.0-src.tgz == Binary file - no diff available. Propchange: dev/geode/1.8.0.RC2/apache-geode-1.8.0-src.tgz -- svn:mime-type = application/octet-stream Added: dev/geode/1.8.0.RC2/apache-geode-1.8.0-src.tgz.asc == --- dev/geode/1.8.0.RC2/apache-geode-1.8.0-src.tgz.asc (added) +++ dev/geode/1.8.0.RC2/apache-geode-1.8.0-src.tgz.asc Thu Dec 6 02:00:49 2018 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCAAdFiEE1cXJUNYYmO3okogg1gSDkr37d5cFAlwFhbkACgkQ1gSDkr37 +d5dtrw/+KGPC0HYP8cmnjh7BP13bpu441oC+GbWzG3LreOvHa5agQD8D5iAfcfXF +G8+98tk5vtvMpTKIs2syfGfC817SNxKrgJ/BOWByEpJ3eNjGih2gUVLxPwlv/pzf +epUUcG2zGxNOxZwjnEZK9iDl+YURt58ZU3daY9Fn1zAIU761knLcPEW/2oTR4tMZ +x+q8fYDMdMduMITgHNxQcckz4V9KqztmtjDGAIifE747SV6XShHxHLcX2BsDPDir +P3xXz9xfD4dI34DgZl91zA3ZBJ/C/zzw4e2T/9KT/MeOjxk9AHkWga8vm3awsbDV +VrvQmqv6KtTTl+fckye3WgGX6qk3SN1LdYKl6RdClvP00EFPAAd7iPSRgbqlTZDN +Leoaq3DEik9bRRpKJYms1iA8XPjnamOtC3mWchjP6S+fHWvWs/z8PXTss+RW7ZFv +WX5Bvn5ep/7veybslJrGAeurwdt1gZJNQhJwnlyBoej9m/uLi5BezVJjcyO1XPFJ +X0xnD3mpQfvz8l8XnGUlSsXzd4mHSdjypvT5bLZItQ4oWgzT0nXxbID45jmjIGQ0 +TrCdudr4tylzMqmR9JFBD7Isg+U4TXmHe5VgvshxTR9z1HlMfF0A7lcO5FiyhRuz +zuz9ghUl1yPFy+JNw8lcK/a607N6i/735gq0HcLQ5LEQC6zCErc= +=Bq4s +-END PGP SIGNATURE- Added: dev/geode/1.8.0.RC2/apache-geode-1.8.0-src.tgz.sha256 == --- dev/geode/1.8.0.RC2/apache-geode-1.8.0-src.tgz.sha256 (added) +++ dev/geode/1.8.0.RC2/apache-geode-1.8.0-src.tgz.sha256 Thu Dec 6 02:00:49 2018 @@ -0,0 +1 @@ +ea76f76860529787291cb57b58863a51afaf12346ce3929c9b873eb7779efdc4 *apache-geode-1.8.0-src.tgz Added: dev/geode/1.8.0.RC2/apache-geode-1.8.0.tgz == Binary file - no diff available. Propchange: dev/geode/1.8.0.RC2/apache-geode-1.8.0.tgz -- svn:mime-type = application/octet-stream Added: dev/geode/1.8.0.RC2/apache-geode-1.8.0.tgz.asc == --- dev/geode/1.8.0.RC2/apache-geode-1.8.0.tgz.asc (added) +++ dev/geode/1.8.0.RC2/apache-geode-1.8.0.tgz.asc Thu Dec 6 02:00:49 2018 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: BCPG v1.58 + +iQIcBAABAgAGBQJcAKpSAAoJENYEg5K9+3eXHT8P/1O4PvJsIu9cAgQAAZLYpjzM +ruQ+yJr1w5Pt4R+VtRcdNbShboov0YjQEVNCGb3Rv5heS/55vM7QFHn9o0uGGvtY +Glqrf9F9eiGbC3cW2NK3OG4GHycJqMnmzJLpqZdLsAV2WJHEjaP4N/omD+mqb9ci +jI5gZaaPsFGGuU8Xr9IZL8oUTllTGcbwPdlDlwx8Ylv1TlkMMBO1VYINrk2aHr+e +9co+fPJp96Vrm0KSHBQbyboHrmbN5BekR9RRvCkcAhyFOK63a43tjMLug+MH5n4b +yVNXeG4Z8jRLCLnzUhIqIeypizkRWO217jV/IfYCaX2J+Yyztfx9KY0NlOcUo0e2 +meDjIK568OaP9zcMsKnOR9RyrH5Qcb+DhlK88P+n/4dJ7uFnxGUXTvig+dPdZgXm +YxWcQzmpnqMKLKCWP5km3R9kcTwaQ8EuuTVP0IsNKJ3Zl1vMCXgkUAQVkdp6HhVl +C1VXL5puHtElVXuXMv3dR+DDM/c4ufx9PvlnDWO+Gnt7VUbcteROQAHTYYnvBCRW +h8GaX6qRiZPJfJGr+UWxmEp9J6zakQEB5ul8SHqGB0cvmzkn+3n5vaGjpTiF6Zgr +gtMLYyIsNRxztMvGwaU8M8HR0J3xEMsCvGhgVgeEJCzq8tTcrNClL4vXa3ggi7qA +UILRlsvc2n4a/y4A3SNu +=XgHf +-END PGP SIGNATURE- Added: dev/geode/1.8.0.RC2/apache-geode-1.8.0.tgz.sha256 == --- dev/geode/1.8.0.RC2/apache-geode-1.8.0.tgz.sha256 (added) +++ dev/geode/1.8.0.RC2/apache-geode-1.8.0.tgz.sha256 Thu Dec 6 02:00:49 2018 @@ -0,0 +1 @@ +58edc41edac4eabd899322b73a24727eac41f6253274c2ce7d0a82227121ae3e *apache-geode-1.8.0.tgz Added: dev/geode/1.8.0.RC2/apache-geode-examples-1.8.0.tar.gz =
[geode] annotated tag rel/v1.8.0.RC2 updated (671671b -> 79023a3)
This is an automated email from the ASF dual-hosted git repository. amurmann pushed a change to annotated tag rel/v1.8.0.RC2 in repository https://gitbox.apache.org/repos/asf/geode.git. *** WARNING: tag rel/v1.8.0.RC2 was modified! *** from 671671b (commit) to 79023a3 (tag) tagging 671671b5e81acde2684df3331aedf176cc927e6e (commit) replaces rel/v1.6.0 by Alexander Murmann on Wed Dec 5 17:54:06 2018 -0800 - Log - Release candidate 2 for 1.8.0 -BEGIN PGP SIGNATURE- iQIzBAABCAAdFiEE1cXJUNYYmO3okogg1gSDkr37d5cFAlwIgT4ACgkQ1gSDkr37 d5dIAg//SxTnjmkt6jL/gfl6ZXe7DSxBs9DC5acij6eFPMzybITtynJuE2lvDiUR Uq6f1v5yu9FI5uUCB00k2PBnS3zPnoP8BFfFsiHnz5Cy3WMhf6TjBvPWHP7pFypc 7WxqAa+NqRrK2Esyq3hEjit24IXaRGd5eUVuHl6G1Jyj2IuKchqunFKGIAfXog6L 7Q6uCWnOZL/e5u4tXCh53AQKJcbEFSTSGjHfvAsHKEQVUAY5tqUDb0GEZkZpK23F juEl0avRUIXP5pTkQkv8I2BfRl6WrrAAVT0j5+yxGAuYQBwOt7SOD3bvBVLZ1wU7 1PsklVXCA3AYtEUOcNzSxFAxWBhz21C3lQ/TEEkyH7G0VPtJpDJv3CNBprzcRQPu ELWkHnsGUxbaubUwPTsdjwIb3Zl27y8b+cMXyi02d+d7ImVhH9C9asxMmm2EuKR7 5VM8nBkKS+6HUbD0Yny+KxaJQ0vCCtdJ957XmWIkQUzsKlIYY7q5bTbqp+5CVsGB x96/eIfX+YXGxS+6i1Gr/O2aBxxYHbl9cf5/YbtxTktzqt5W56pGi4LXFNO7HuKl goltSeDrsK4kIFvXught/SO4fwe3drxZUmrMF4DCG635bLQ1hMbguMuDj4DjhZZT r0cPYqU/km4yagS4bDrXhBfl99jJ70iAX08ABoxFl2d29UuTUFk= =B3LP -END PGP SIGNATURE- --- No new revisions were added by this update. Summary of changes:
[geode-examples] annotated tag rel/v1.8.0.RC2 updated (aee3794 -> 939263e)
This is an automated email from the ASF dual-hosted git repository. amurmann pushed a change to annotated tag rel/v1.8.0.RC2 in repository https://gitbox.apache.org/repos/asf/geode-examples.git. *** WARNING: tag rel/v1.8.0.RC2 was modified! *** from aee3794 (commit) to 939263e (tag) tagging aee3794f1302ffab51b4ca5d02657598420b7a00 (commit) replaces rel/v1.7.0 by Alexander Murmann on Wed Dec 5 17:52:24 2018 -0800 - Log - Release candidate 2 for 1.8.0 -BEGIN PGP SIGNATURE- iQIzBAABCAAdFiEE1cXJUNYYmO3okogg1gSDkr37d5cFAlwIgNgACgkQ1gSDkr37 d5eAUg/+IbJFZkqilUUB+2XMitC3xO1mCasCgW57/6ysIA3MsM7veatBGvFX1CF7 VxAo9BFQaH+iU5kORRif/o+3s5tD13DJvIuS1MuTIWruiPoc4+9Sl0GKlMZ7TnDc 5b6CKr8HEP+edk6rngkchAeIzQ/uZrDa6flHlvIJgcbsN5srUw4kX1C4frLB2XvI GivyV6nTAb0i4+fnMn8zYfsHa0PWXkDG4wbiHJ3piAk6WEHBaI+/kaFBs6vk+dmC APDG0P4x9FVESTJlN7cT8hutHm7EGE1V9DCydi54AiTOR/jsAKEadB1PJx8p+l1Z kZDZA4lME70s/5AnSB9J9oane0wupht1CsM9oQvHahT7nW9YDoymBfQ1JJ15dCTK u0POUuXlmnf+SDlC8BHAYsIhDFlNBgx6C1mOEF2YITnzj/Ju4ZK+1W+2jixPsClC aZUllJkJagR08ns0edY8TEO/r1bmrzzPpz5M44S7/fMtGBgBDERMNqRmgShMQeqk RyrV/onnQFN6HEc8ZOyau6SA5LeeRhNtMJPXiWXv7B3rHOxQOCwO3/bPTvJ25E/3 tClzq9ukcR8K8567I68qBN5PijJczs/j5zMND4CNyePBfkcK/jOIy1MC6sYxXzsd ZNCDgOWwsBXuHzX0V+UkdZw0YiJ8nLBrJlqASSmZWZG5KULArhg= =ZQda -END PGP SIGNATURE- --- No new revisions were added by this update. Summary of changes:
[geode] branch feature/GEODE-6149 updated (b50bdce -> 9a906db)
This is an automated email from the ASF dual-hosted git repository.
zhouxj pushed a change to branch feature/GEODE-6149
in repository https://gitbox.apache.org/repos/asf/geode.git.
discard b50bdce GEODE-6149: when client's cache is closing, its
GetClientPRMetaDataOp could end up with NPE
add ad3a082 GEODE-5971: JaxbService should be able to unmarshall older
namespace xml (#2951)
add 8ba2b34 GEODE-6100: Cleanup suspect string logic for better
readability (#2920)
add 3611f1b GEODE-5883: Add Nebula dependency linter as gradle utility
(#2939)
add 9a906db GEODE-6149: when client's cache is closing, its
GetClientPRMetaDataOp could end up with NPE
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (b50bdce)
\
N -- N -- N refs/heads/feature/GEODE-6149 (9a906db)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
build.gradle | 14 +-
.../geode/cache/configuration/CacheConfig.java | 5 +-
.../apache/geode/internal/config/JAXBService.java | 16 +-
.../NameSpaceFilter.java} | 36 ++-
.../config/VersionAdapter.java}| 16 +-
.../geode/internal/config/JAXBServiceTest.java | 31 ++
.../geode/test/dunit/internal/DUnitLauncher.java | 41 +--
.../geode/test/greplogs/ExpectedStrings.java | 211 +++--
.../apache/geode/test/greplogs/LogConsumer.java| 349 -
.../lint.gradle| 13 +-
10 files changed, 404 insertions(+), 328 deletions(-)
copy
geode-core/src/main/java/org/apache/geode/internal/{cache/extension/Extensible.java
=> config/NameSpaceFilter.java} (57%)
copy
geode-core/src/main/java/org/apache/geode/{redis/internal/executor/list/LPopExecutor.java
=> internal/config/VersionAdapter.java} (73%)
mode change 100755 => 100644
copy
geode-core/src/main/java/org/apache/geode/internal/cache/HasDiskRegion.java~d2263ebc2...
Create HasDiskRegion interface => gradle/lint.gradle (67%)
[geode-native] branch develop updated: GEODE-4728 User Guide - update links
This is an automated email from the ASF dual-hosted git repository.
dbarnes 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 b71cd9e GEODE-4728 User Guide - update links
b71cd9e is described below
commit b71cd9e39367bc07290b0e33c6b076ee5403ceb6
Author: Dave Barnes
AuthorDate: Wed Dec 5 17:32:59 2018 -0800
GEODE-4728 User Guide - update links
---
docs/geode-native-book/redirects.rb | 4 ++--
docs/geode-native-docs/about-client-users-guide.html.md.erb | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/docs/geode-native-book/redirects.rb
b/docs/geode-native-book/redirects.rb
index 4b64e23..6031a71 100644
--- a/docs/geode-native-book/redirects.rb
+++ b/docs/geode-native-book/redirects.rb
@@ -19,5 +19,5 @@ r301 %r{/releases/latest/javadoc/(.*)},
'http://geode.apache.org/releases/latest
# Links to User Guides #
rewrite '/', '/docs/geode-native/18/about-client-users-guide.html'
rewrite '/index.html', '/docs/geode-native/18/about-client-users-guide.html'
-r301 %r{/serverman/(.*)}, 'http://geode.apache.org/docs/guide/16/$1'
-r301 %r{/geodeman/(.*)}, 'http://geode.apache.org/docs/guide/16/$1'
+r301 %r{/serverman/(.*)}, 'http://geode.apache.org/docs/guide/18/$1'
+r301 %r{/geodeman/(.*)}, 'http://geode.apache.org/docs/guide/18/$1'
diff --git a/docs/geode-native-docs/about-client-users-guide.html.md.erb
b/docs/geode-native-docs/about-client-users-guide.html.md.erb
index 4ddcb7b..04c2c92 100644
--- a/docs/geode-native-docs/about-client-users-guide.html.md.erb
+++ b/docs/geode-native-docs/about-client-users-guide.html.md.erb
@@ -21,10 +21,10 @@ Published September 21, 2018
The <%=vars.product_name_long%> Native Client is a library that provides
access for C++ and Microsoft® .NET™ clients to a
<%=vars.product_name%> distributed system.
-See the API docs in their staging (pre-production) locations for API details:
+See the API docs for API details:
- - [C++ API docs](https://gemfire-nc-100-cppdocs.cfapps.io)
- - [.NET API docs](https://gemfire-nc-100-dotnetdocs.cfapps.io)
+ - [C++ API docs](https://geode.apache.org/releases/latest/cpp/index.html)
+ - [.NET API docs](https://geode.apache.org/releases/latest/dotnet/index.html)
See the [_<%=vars.product_name_long%> User
Guide_](/serverman/about_<%=vars.product_name.downcase%>.html) for information
regarding the server.
[geode] branch develop updated: GEODE-5883: Add Nebula dependency linter as gradle utility (#2939)
This is an automated email from the ASF dual-hosted git repository.
prhomberg 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 3611f1b GEODE-5883: Add Nebula dependency linter as gradle utility
(#2939)
3611f1b is described below
commit 3611f1bea944c45e074e1ff902cc06ce8a148ee4
Author: Patrick Rhomberg
AuthorDate: Wed Dec 5 17:10:25 2018 -0800
GEODE-5883: Add Nebula dependency linter as gradle utility (#2939)
* Introduce Nebula lint plugin, version 10.1.0
* Update Nebula project plugin version 4.0.1 -> 5.1.0
* Update gradle-git plugin version 1.3.2 -> 1.7.2
* The lint plugin is intentionally not yet run as part of the project
:check.
Early introduction will be required by some subprojects,
so that they may reference the plugin configuration.
---
build.gradle | 14 ++
gradle/lint.gradle | 29 +
2 files changed, 39 insertions(+), 4 deletions(-)
diff --git a/build.gradle b/build.gradle
index 0c6012f..49997a5 100755
--- a/build.gradle
+++ b/build.gradle
@@ -24,13 +24,18 @@ buildscript {
}
dependencies {
-classpath "org.ajoberstar:gradle-git:1.3.2"
+// Newer versions of the nebula plugins require gradle-info-plugin 4.0.2
or higher, which in
+// depends on JGit 5.0. Conversely, gradle-git relies of JGit 4.0.
+// Be mindful of potential classpath issues when updating any of these
three dependencies.
+classpath "com.netflix.nebula:nebula-project-plugin:5.1.0"
+classpath "com.netflix.nebula:gradle-lint-plugin:10.1.0"
+classpath "org.ajoberstar:gradle-git:1.7.2"
+
classpath "gradle.plugin.org.nosphere.apache:creadur-rat-gradle:0.3.1"
classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.6.2'
classpath "com.diffplug.spotless:spotless-plugin-gradle:3.10.0"
classpath "me.champeau.gradle:jmh-gradle-plugin:0.4.7"
classpath 'com.github.ben-manes:gradle-versions-plugin:0.17.0'
-classpath "com.netflix.nebula:nebula-project-plugin:4.0.1"
}
}
@@ -75,6 +80,7 @@ apply from: "${scriptDir}/sonar.gradle"
apply from: "${scriptDir}/rat.gradle"
apply from: "${scriptDir}/docker.gradle"
apply from: "${scriptDir}/spotless.gradle"
+apply from: "${scriptDir}/lint.gradle"
apply from: "${scriptDir}/resolve-dependencies.gradle"
subprojects {
@@ -99,9 +105,9 @@ ext.readScmInfo = { proj ->
def git = org.ajoberstar.grgit.Grgit.open(currentDir:
project(proj).projectDir)
try {
return [
- 'Source-Repository': git.branch.getCurrent().name,
+ 'Source-Repository': git.branch.current.name,
'Source-Revision' : git.head().id,
- 'Source-Date' : git.head().getDate().format('-MM-dd
HH:mm:ss Z')
+ 'Source-Date' : git.head().date.format('-MM-dd HH:mm:ss Z')
] as Properties
} finally {
git.close()
diff --git a/gradle/lint.gradle b/gradle/lint.gradle
new file mode 100644
index 000..9d91f5a
--- /dev/null
+++ b/gradle/lint.gradle
@@ -0,0 +1,29 @@
+/*
+ * 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.
+ */
+
+allprojects {
+ apply plugin: 'nebula.lint'
+ gradleLint.rules = []
+ gradleLint.rules += 'overridden-dependency-version'
+ gradleLint.rules += 'unused-dependency'
+ gradleLint.rules += 'unused-exclude-by-dep'
+ gradleLint.rules += 'unused-exclude-by-conf'
+
+ gradleLint.alwaysRun = false
+ fixGradleLint.mustRunAfter(':combineReports')
+ lintGradle.mustRunAfter(':combineReports')
+}
[geode] branch develop updated: GEODE-6100: Cleanup suspect string logic for better readability (#2920)
This is an automated email from the ASF dual-hosted git repository.
prhomberg 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 8ba2b34 GEODE-6100: Cleanup suspect string logic for better
readability (#2920)
8ba2b34 is described below
commit 8ba2b3442cc5c187bbd43df14c754e6d686eb2f1
Author: Patrick Rhomberg
AuthorDate: Wed Dec 5 17:09:42 2018 -0800
GEODE-6100: Cleanup suspect string logic for better readability (#2920)
---
.../geode/test/dunit/internal/DUnitLauncher.java | 41 +--
.../geode/test/greplogs/ExpectedStrings.java | 211 +++--
.../apache/geode/test/greplogs/LogConsumer.java| 349 -
3 files changed, 308 insertions(+), 293 deletions(-)
diff --git
a/geode-dunit/src/main/java/org/apache/geode/test/dunit/internal/DUnitLauncher.java
b/geode-dunit/src/main/java/org/apache/geode/test/dunit/internal/DUnitLauncher.java
index 0303bc4..4ed724b 100644
---
a/geode-dunit/src/main/java/org/apache/geode/test/dunit/internal/DUnitLauncher.java
+++
b/geode-dunit/src/main/java/org/apache/geode/test/dunit/internal/DUnitLauncher.java
@@ -32,7 +32,6 @@ import java.io.FileReader;
import java.io.IOException;
import java.lang.reflect.Method;
import java.net.InetAddress;
-import java.net.URISyntaxException;
import java.nio.channels.FileChannel;
import java.nio.charset.Charset;
import java.rmi.AlreadyBoundException;
@@ -41,6 +40,7 @@ import java.rmi.registry.LocateRegistry;
import java.rmi.registry.Registry;
import java.util.List;
import java.util.Properties;
+import java.util.regex.Pattern;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.LogManager;
@@ -127,7 +127,7 @@ public class DUnitLauncher {
// TODO - this is hacky way to test for a hydra environment - see
// if there is registered test configuration object.
Class clazz = Class.forName("hydra.TestConfig");
- Method getInstance = clazz.getMethod("getInstance", new Class[0]);
+ Method getInstance = clazz.getMethod("getInstance");
getInstance.invoke(null);
return true;
} catch (Exception e) {
@@ -174,7 +174,7 @@ public class DUnitLauncher {
return "localhost[" + locatorPort + "]";
}
- private static void launch() throws URISyntaxException,
AlreadyBoundException, IOException,
+ private static void launch() throws AlreadyBoundException, IOException,
InterruptedException, NotBoundException {
DUNIT_SUSPECT_FILE = new File(SUSPECT_FILENAME);
DUNIT_SUSPECT_FILE.delete();
@@ -197,35 +197,7 @@ public class DUnitLauncher {
// restrict membership ports to be outside of AvailablePort's range
System.setProperty(DistributionConfig.RESTRICT_MEMBERSHIP_PORT_RANGE,
"true");
-Runtime.getRuntime().addShutdownHook(new Thread() {
- public void run() {
-// System.out.println("shutting down DUnit JVMs");
-// for (int i=0; i System.currentTimeMillis()) {
-// if (!processManager.hasLiveVMs()) {
-// return;
-// }
-// System.out.print(".");
-// System.out.flush();
-// try {
-// Thread.sleep(1000);
-// } catch (InterruptedException e) {
-// break;
-// }
-// }
-// System.out.println("\nkilling any remaining JVMs");
-processManager.killVMs();
- }
-});
+Runtime.getRuntime().addShutdownHook(new Thread(processManager::killVMs));
// Create a VM for the locator
processManager.launchVM(LOCATOR_VM_NUM);
@@ -350,9 +322,8 @@ public class DUnitLauncher {
public static void closeAndCheckForSuspects() {
if (isLaunched()) {
- final boolean skipLogMsgs = ExpectedStrings.skipLogMsgs("dunit");
- final List expectedStrings = ExpectedStrings.create("dunit");
- final LogConsumer logConsumer = new LogConsumer(skipLogMsgs,
expectedStrings, "log4j", 5);
+ final List expectedStrings = ExpectedStrings.create("dunit");
+ final LogConsumer logConsumer = new LogConsumer(true, expectedStrings,
"log4j", 5);
final StringBuilder suspectStringBuilder = new StringBuilder();
diff --git
a/geode-dunit/src/main/java/org/apache/geode/test/greplogs/ExpectedStrings.java
b/geode-dunit/src/main/java/org/apache/geode/test/greplogs/ExpectedStrings.java
index 325a1ea..68501d7 100644
---
a/geode-dunit/src/main/java/org/apache/geode/test/greplogs/ExpectedStrings.java
+++
b/geode-dunit/src/main/java/org/apache/geode/test/greplogs/ExpectedStrings.java
@@ -23,16 +23,12 @@ public class ExpectedStrings {
private ExpectedStrings() {}
public static boolean skipLogMsgs(String type) {
-if (type.equals("junit") || type.equals("java") || type.equals("query")
-|| type.equals("dunit")) {
- return true;
-} else {
- return false;
-}
+return type.equals("junit") || type.equals("java") || type.equals("query")
+
[geode] branch bug/GEODE-5742 deleted (was fa23da5)
This is an automated email from the ASF dual-hosted git repository. wirebaron pushed a change to branch bug/GEODE-5742 in repository https://gitbox.apache.org/repos/asf/geode.git. was fa23da5 Previous build failed due to concourse max containers reached This change permanently discards the following revisions: discard fa23da5 Previous build failed due to concourse max containers reached discard bec7f68 Updating test to check for new error string. discard b7b0166 Still seeing issues with concourse heavy-lifter, one more try discard 9adfc09 Restarting check-in run due to enviromental turbulance. discard dd292c5 Updating some documentation and comments to reflect the new port range discard c4e7452 GEODE-5742: Restrict default membership range to not conflict with default ports discard 7b8e2a7 GEODE-5742: improving logging for failure to connect to locator
[geode-benchmarks] 01/01: Fixing the number of threads to 48 in all benchmarks
This is an automated email from the ASF dual-hosted git repository.
upthewaterspout pushed a commit to branch feature/fixed_48_threads
in repository https://gitbox.apache.org/repos/asf/geode-benchmarks.git
commit e78aa2858e73725ad03f8d05fa630fd6a87fbb3b
Author: Dan Smith
AuthorDate: Wed Dec 5 16:13:15 2018 -0800
Fixing the number of threads to 48 in all benchmarks
---
.../main/java/org/apache/geode/benchmark/tests/BenchmarkOperation.java | 1 +
1 file changed, 1 insertion(+)
diff --git
a/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tests/BenchmarkOperation.java
b/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tests/BenchmarkOperation.java
index d67832e..61ec9d8 100644
---
a/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tests/BenchmarkOperation.java
+++
b/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tests/BenchmarkOperation.java
@@ -59,6 +59,7 @@ public abstract class BenchmarkOperation {
config.name(this.getClass().getCanonicalName());
config.warmupSeconds(WARM_UP_TIME);
config.durationSeconds(BENCHMARK_DURATION);
+config.threads(48);
config.role(LOCATOR, 1);
config.role(SERVER, 2);
config.role(CLIENT, 1);
[geode-benchmarks] branch feature/fixed_48_threads created (now e78aa28)
This is an automated email from the ASF dual-hosted git repository. upthewaterspout pushed a change to branch feature/fixed_48_threads in repository https://gitbox.apache.org/repos/asf/geode-benchmarks.git. at e78aa28 Fixing the number of threads to 48 in all benchmarks This branch includes the following new commits: new e78aa28 Fixing the number of threads to 48 in all benchmarks 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.
[geode] branch feature/GEODE-2113 updated (d27dca5 -> ea9b641)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch feature/GEODE-2113 in repository https://gitbox.apache.org/repos/asf/geode.git. from d27dca5 GEODE-2113 Implement SSL over NIO add ea9b641 empty commit No new revisions were added by this update. Summary of changes:
[geode] branch concourse-staging deleted (was 9f6b289)
This is an automated email from the ASF dual-hosted git repository. upthewaterspout pushed a change to branch concourse-staging in repository https://gitbox.apache.org/repos/asf/geode.git. was 9f6b289 GEODE-5714: Retry ssh connections in concourse This change permanently discards the following revisions: discard 9f6b289 GEODE-5714: Retry ssh connections in concourse discard aff9c7f Limit max number of simultaneous runs to 5.
[geode] branch feature/GEODE-6151 created (now f4de8ee)
This is an automated email from the ASF dual-hosted git repository. dschneider pushed a change to branch feature/GEODE-6151 in repository https://gitbox.apache.org/repos/asf/geode.git. at f4de8ee GEODE-6151: use same term for JDBC mapping This branch includes the following new commits: new f4de8ee GEODE-6151: use same term for JDBC mapping 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.
[geode] 01/01: GEODE-6151: use same term for JDBC mapping
This is an automated email from the ASF dual-hosted git repository.
dschneider pushed a commit to branch feature/GEODE-6151
in repository https://gitbox.apache.org/repos/asf/geode.git
commit f4de8eed44a0903cb07569b91ff0c0da55f6a191
Author: Darrel Schneider
AuthorDate: Wed Dec 5 16:02:12 2018 -0800
GEODE-6151: use same term for JDBC mapping
---
.../jdbc/internal/cli/CreateMappingCommandDUnitTest.java | 2 +-
.../jdbc/internal/cli/DescribeMappingCommandDUnitTest.java | 2 +-
.../jdbc/internal/cli/ListMappingCommandDUnitTest.java | 2 +-
.../geode/connectors/jdbc/internal/JdbcConnectorServiceImpl.java | 4 ++--
.../geode/connectors/jdbc/internal/cli/CreateMappingCommand.java | 6 +++---
.../connectors/jdbc/internal/cli/DescribeMappingCommand.java | 6 +++---
.../connectors/jdbc/internal/cli/DestroyMappingCommand.java | 5 +++--
.../connectors/jdbc/internal/cli/DestroyMappingFunction.java | 4 ++--
.../geode/connectors/jdbc/internal/cli/ListMappingCommand.java | 9 +++--
.../connectors/jdbc/internal/cli/CreateMappingCommandTest.java | 2 +-
.../jdbc/internal/cli/DestroyMappingCommandFunctionTest.java | 6 +++---
.../connectors/jdbc/internal/cli/ListMappingCommandTest.java | 2 +-
12 files changed, 24 insertions(+), 26 deletions(-)
diff --git
a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandDUnitTest.java
b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandDUnitTest.java
index 6856fc7..d71f257 100644
---
a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandDUnitTest.java
+++
b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandDUnitTest.java
@@ -314,7 +314,7 @@ public class CreateMappingCommandDUnitTest {
csb.addOption(CREATE_MAPPING__TABLE_NAME, "bogusTable");
gfsh.executeAndAssertThat(csb.toString()).statusIsError()
.containsOutput(
-"A jdbc-mapping for " + convertRegionPathToName(regionName) + "
already exists");
+"A JDBC mapping for " + convertRegionPathToName(regionName) + "
already exists");
server.invoke(() -> {
RegionMapping mapping = getRegionMappingFromService(regionName);
diff --git
a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommandDUnitTest.java
b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommandDUnitTest.java
index a79a9ba..d21227e 100644
---
a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommandDUnitTest.java
+++
b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommandDUnitTest.java
@@ -116,7 +116,7 @@ public class DescribeMappingCommandDUnitTest implements
Serializable {
commandResultAssert.statusIsError();
commandResultAssert.containsOutput(
-String.format("(Experimental) \n" + "mapping for region 'nonExisting'
not found"));
+String.format("(Experimental) \n" + "JDBC mapping for region
'nonExisting' not found"));
}
@Test
diff --git
a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommandDUnitTest.java
b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommandDUnitTest.java
index 2d90bdf..00cc454 100644
---
a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommandDUnitTest.java
+++
b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommandDUnitTest.java
@@ -107,7 +107,7 @@ public class ListMappingCommandDUnitTest implements
Serializable {
CommandResultAssert commandResultAssert =
gfsh.executeAndAssertThat(csb.toString());
commandResultAssert.statusIsSuccess();
-commandResultAssert.containsOutput("No mappings found");
+commandResultAssert.containsOutput("No JDBC mappings found");
}
private void createNRegionMappings(int N) throws
RegionMappingExistsException {
diff --git
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/JdbcConnectorServiceImpl.java
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/JdbcConnectorServiceImpl.java
index faee0c5..5d2398e 100644
---
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/JdbcConnectorServiceImpl.java
+++
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/JdbcConnectorServiceImpl.java
@@ -45,7 +45,7 @@ public class JdbcConnectorServiceImpl implements
JdbcConnectorService {
mappingsByRegion.putIfAbsent(mapping.getRegionName(), mapping);
if (existing != null) {
throw new Reg
[geode-benchmarks] 01/01: Merge pull request #15 from smgoller/sole-tenant
This is an automated email from the ASF dual-hosted git repository. smgoller pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/geode-benchmarks.git commit 0ee9ec6e0c57117c3e5fe472adbcb51e6f4c3206 Merge: eb4dcab 16047b2 Author: Sean Goller AuthorDate: Wed Dec 5 15:59:29 2018 -0800 Merge pull request #15 from smgoller/sole-tenant Convert to sole tenant style cluster. infrastructure/google_cloud/destroy_cluster.sh | 4 infrastructure/google_cloud/launch_cluster.sh | 7 ++- 2 files changed, 10 insertions(+), 1 deletion(-)
[geode-benchmarks] branch develop updated (eb4dcab -> 0ee9ec6)
This is an automated email from the ASF dual-hosted git repository. smgoller pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode-benchmarks.git. from eb4dcab Ignoring extra hosts in SshInfrastructure add 16047b2 Convert to sole tenant style cluster. new 0ee9ec6 Merge pull request #15 from smgoller/sole-tenant 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: infrastructure/google_cloud/destroy_cluster.sh | 4 infrastructure/google_cloud/launch_cluster.sh | 7 ++- 2 files changed, 10 insertions(+), 1 deletion(-)
[geode] branch feature/GEODE-2113 updated (dd5f6f4 -> d27dca5)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch feature/GEODE-2113 in repository https://gitbox.apache.org/repos/asf/geode.git. from dd5f6f4 GEODE-2113 Implement SSL over NIO add d27dca5 GEODE-2113 Implement SSL over NIO No new revisions were added by this update. Summary of changes: .../client/internal/CacheServerSSLConnectionDUnitTest.java | 10 +- .../main/java/org/apache/geode/internal/tcp/Connection.java| 1 - 2 files changed, 9 insertions(+), 2 deletions(-)
[geode] branch feature/GEODE-QueryProvider deleted (was c8d01af)
This is an automated email from the ASF dual-hosted git repository. prhomberg pushed a change to branch feature/GEODE-QueryProvider in repository https://gitbox.apache.org/repos/asf/geode.git. was c8d01af GEODE-QueryProvider: added pointsConfigMap to support numeric query Adds in a test for int range lucene query (#2065) refactor the test cases to different package This change permanently discards the following revisions: discard c8d01af GEODE-QueryProvider: added pointsConfigMap to support numeric query Adds in a test for int range lucene query (#2065) refactor the test cases to different package
[geode] branch spike-jdbc-cache-xml deleted (was 3414be5)
This is an automated email from the ASF dual-hosted git repository. prhomberg pushed a change to branch spike-jdbc-cache-xml in repository https://gitbox.apache.org/repos/asf/geode.git. was 3414be5 WIP Spike to change cache.xml for JDBC connector This change permanently discards the following revisions: discard 3414be5 WIP Spike to change cache.xml for JDBC connector
[geode] branch develop updated: GEODE-5971: JaxbService should be able to unmarshall older namespace xml (#2951)
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 ad3a082 GEODE-5971: JaxbService should be able to unmarshall older
namespace xml (#2951)
ad3a082 is described below
commit ad3a08295cca7c15c1350f52af4c3436e2da9e4c
Author: jinmeiliao
AuthorDate: Wed Dec 5 15:15:40 2018 -0800
GEODE-5971: JaxbService should be able to unmarshall older namespace xml
(#2951)
---
.../geode/cache/configuration/CacheConfig.java | 5 ++-
.../apache/geode/internal/config/JAXBService.java | 16 +++-
.../geode/internal/config/NameSpaceFilter.java | 43 ++
.../geode/internal/config/VersionAdapter.java | 30 +++
.../geode/internal/config/JAXBServiceTest.java | 31
5 files changed, 122 insertions(+), 3 deletions(-)
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/configuration/CacheConfig.java
b/geode-core/src/main/java/org/apache/geode/cache/configuration/CacheConfig.java
index c1c59f8..ec23dac 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/configuration/CacheConfig.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/configuration/CacheConfig.java
@@ -31,13 +31,13 @@ import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.w3c.dom.Element;
import org.apache.geode.annotations.Experimental;
import org.apache.geode.cache.Region;
+import org.apache.geode.internal.config.VersionAdapter;
/**
@@ -328,12 +328,13 @@ public class CacheConfig {
@XmlAttribute(name = "search-timeout")
protected String searchTimeout;
@XmlAttribute(name = "version", required = true)
- @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+ @XmlJavaTypeAdapter(VersionAdapter.class)
protected String version;
public CacheConfig() {}
public CacheConfig(String version) {
+
this.version = version;
}
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/config/JAXBService.java
b/geode-core/src/main/java/org/apache/geode/internal/config/JAXBService.java
index 9f3af69..6927d2f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/config/JAXBService.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/config/JAXBService.java
@@ -28,11 +28,15 @@ import javax.xml.XMLConstants;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.Marshaller;
import javax.xml.bind.Unmarshaller;
+import javax.xml.transform.sax.SAXSource;
import javax.xml.validation.Schema;
import javax.xml.validation.SchemaFactory;
import org.apache.commons.lang3.StringUtils;
+import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
+import org.xml.sax.XMLReader;
+import org.xml.sax.helpers.XMLReaderFactory;
import org.apache.geode.cache.configuration.XSDRootElement;
import org.apache.geode.internal.ClassPathLoader;
@@ -93,9 +97,19 @@ public class JAXBService {
public T unMarshall(String xml) {
try {
- return (T) unmarshaller.unmarshal(new StringReader(xml));
+ InputSource is = new InputSource(new StringReader(xml));
+ XMLReader reader = XMLReaderFactory.createXMLReader();
+
+ // use a custom Filter so that we can unmarshall older namespace or no
namespace xml
+ NameSpaceFilter filter = new NameSpaceFilter();
+ filter.setParent(reader);
+ SAXSource source = new SAXSource(filter, is);
+
+ return (T) unmarshaller.unmarshal(source);
} catch (Exception e) {
throw new RuntimeException(e.getMessage(), e);
}
}
+
+
}
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/config/NameSpaceFilter.java
b/geode-core/src/main/java/org/apache/geode/internal/config/NameSpaceFilter.java
new file mode 100644
index 000..a31546b
--- /dev/null
+++
b/geode-core/src/main/java/org/apache/geode/internal/config/NameSpaceFilter.java
@@ -0,0 +1,43 @@
+/*
+ * 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 l
[geode] branch feature/GEODE-2113 created (now dd5f6f4)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch feature/GEODE-2113 in repository https://gitbox.apache.org/repos/asf/geode.git. at dd5f6f4 GEODE-2113 Implement SSL over NIO This branch includes the following new commits: new dd5f6f4 GEODE-2113 Implement SSL over NIO 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.
[geode-native] branch develop updated: GEODE-5769: remove app domain context (#412)
This is an automated email from the ASF dual-hosted git repository.
bbender 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 d258c24 GEODE-5769: remove app domain context (#412)
d258c24 is described below
commit d258c24e5c53ce12108146b57c31966a4245d19f
Author: Matthew Reddington
AuthorDate: Wed Dec 5 14:19:07 2018 -0800
GEODE-5769: remove app domain context (#412)
* Remove appDomainContext and add query test
* Updated the tests to pass consistently.
---
clicache/integration-test2/CMakeLists.txt | 1 +
clicache/integration-test2/QueryTest.cs | 202 ++
cppcache/src/TcrChunkedContext.hpp| 11 +-
3 files changed, 204 insertions(+), 10 deletions(-)
diff --git a/clicache/integration-test2/CMakeLists.txt
b/clicache/integration-test2/CMakeLists.txt
index f555ef1..e122168 100644
--- a/clicache/integration-test2/CMakeLists.txt
+++ b/clicache/integration-test2/CMakeLists.txt
@@ -38,6 +38,7 @@ add_library( ${PROJECT_NAME} SHARED
CacheXml.cs
CacheXmlTests.cs
CqOperationTest.cs
+QueryTest.cs
RegionTest.cs
RegionSSLTest.cs
Position.cs
diff --git a/clicache/integration-test2/QueryTest.cs
b/clicache/integration-test2/QueryTest.cs
new file mode 100644
index 000..17fc292
--- /dev/null
+++ b/clicache/integration-test2/QueryTest.cs
@@ -0,0 +1,202 @@
+/*
+ * 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.
+ */
+
+using System;
+using System.IO;
+using Xunit;
+using System.Diagnostics;
+using System.Threading;
+
+namespace Apache.Geode.Client.IntegrationTests
+{
+ public class QueryOrder : IPdxSerializable
+ {
+private const string ORDER_ID_KEY_ = "order_id";
+private const string NAME_KEY_ = "name";
+private const string QUANTITY_KEY_ = "quantity";
+public long OrderId { get; set; }
+public string Name { get; set; }
+public short Quantity { get; set; }
+// A default constructor is required for deserialization
+public QueryOrder() { }
+public QueryOrder(int orderId, string name, short quantity)
+{
+ OrderId = orderId;
+ Name = name;
+ Quantity = quantity;
+}
+public override string ToString()
+{
+ return string.Format("Order: [{0}, {1}, {2}]", OrderId, Name, Quantity);
+}
+public void ToData(IPdxWriter output)
+{
+ output.WriteLong(ORDER_ID_KEY_, OrderId);
+ output.MarkIdentityField(ORDER_ID_KEY_);
+ output.WriteString(NAME_KEY_, Name);
+ output.MarkIdentityField(NAME_KEY_);
+ output.WriteInt(QUANTITY_KEY_, Quantity);
+ output.MarkIdentityField(QUANTITY_KEY_);
+}
+public void FromData(IPdxReader input)
+{
+ OrderId = input.ReadLong(ORDER_ID_KEY_);
+ Name = input.ReadString(NAME_KEY_);
+ Quantity = (short)input.ReadInt(QUANTITY_KEY_);
+}
+public static IPdxSerializable CreateDeserializable()
+{
+ return new QueryOrder();
+}
+ }
+
+
+ [Trait("Category", "Integration")]
+ public class QueryTest : TestBase, IDisposable
+ {
+private readonly Cache cache_;
+
+public QueryTest()
+{
+ var cacheFactory = new CacheFactory()
+ .Set("log-level", "error");
+ cache_ = cacheFactory.Create();
+}
+
+public void Dispose()
+{
+ cache_.Close();
+}
+
+[Fact]
+public void PdxSerializableQueryHaveCorrectValues()
+{
+ using (var cluster_ = new Cluster(CreateTestCaseDirectoryName(), 1, 1))
+ {
+Assert.Equal(cluster_.Start(), true);
+Assert.Equal(cluster_.Gfsh.create()
+.region()
+.withName("cqTestRegion")
+.withType("REPLICATE")
+.execute(), 0);
+cache_.TypeRegistry.RegisterPdxType(QueryOrder.CreateDeserializable);
+var poolFactory = cache_.GetPoolFactory()
+.AddLocator("localhost", cluster_.Gfsh.LocatorPort);
+var pool = poolFactory
+.SetSubscriptionEnabled(true)
+.Create("pool");
+
+var regionFactory = cache_.CreateRegionFactory(RegionShortcut.PROXY)
+.SetPoolName("pool");
+
+var region
[geode] branch feature/GEODE-6149 updated (b13401c -> b50bdce)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-6149 in repository https://gitbox.apache.org/repos/asf/geode.git. discard b13401c GEODE-6149: when client's cache is closing, its GetClientPRMetaDataOp could end up with NPE add a49e03a GEODE-6109: Correct accidental deletion of critical .yml line. add a4e51c8 GEODE-6144 use version of concourse-pipeline-resource that has fix for large number of pipelines add afd9ea8 Merge pull request #2947 from onichols-pivotal/GEODE-6144-fix-red-meta add 6a0e08b GEODE-6107: in test start locators one at a time (#2933) add 322628f Fix ZipSlip bug found by LGTM.com add 3a4a932 Merge pull request #2948 from samlanning/zip-slip add b9c9966 GEODE-6127 Document changes to gfsh create jndi-binding command (#2942) add eb829c6 GEODE-6143: Change PowerMockito import to Mockito add b50bdce GEODE-6149: when client's cache is closing, its GetClientPRMetaDataOp could end up with NPE This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (b13401c) \ N -- N -- N refs/heads/feature/GEODE-6149 (b50bdce) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: ci/pipelines/geode-build/jinja.template.yml| 1 + ci/pipelines/meta/jinja.template.yml | 1 + .../management/JMXMBeanReconnectDUnitTest.java | 3 +++ ...FastLoggerWithDefaultConfigIntegrationTest.java | 2 +- .../internal/configuration/utils/ZipUtils.java | 9 --- .../internal/GetClientPRMetaDataOpJUnitTest.java | 14 +++ .../gfsh/command-pages/create.html.md.erb | 16 ++--- .../apache/geode/test/dunit/rules/MemberVM.java| 28 ++ 8 files changed, 62 insertions(+), 12 deletions(-)
[geode] 01/01: GEODE-6149: when client's cache is closing, its GetClientPRMetaDataOp could end up with NPE
This is an automated email from the ASF dual-hosted git repository.
zhouxj pushed a commit to branch feature/GEODE-6149
in repository https://gitbox.apache.org/repos/asf/geode.git
commit b13401c12ae53cc8356ba8f051eb10124d4680af
Author: zhouxh
AuthorDate: Wed Dec 5 11:08:32 2018 -0800
GEODE-6149: when client's cache is closing, its GetClientPRMetaDataOp could
end up with NPE
---
.../client/internal/GetClientPRMetaDataOp.java | 5
.../internal/GetClientPRMetaDataOpJUnitTest.java | 32 ++
2 files changed, 37 insertions(+)
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetClientPRMetaDataOp.java
b/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetClientPRMetaDataOp.java
index c82860d..5b676a0 100755
---
a/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetClientPRMetaDataOp.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetClientPRMetaDataOp.java
@@ -95,6 +95,11 @@ public class GetClientPRMetaDataOp {
}
int numParts = msg.getNumberOfParts();
ClientPartitionAdvisor advisor =
cms.getClientPartitionAdvisor(regionFullPath);
+ if (advisor == null) {
+logger.debug(
+"GetClientPRMetaDataOpImpl#processResponse: advisor is null,
which could be due to cache is closed. Not to update PR meta data.");
+return null;
+ }
for (int i = 0; i < numParts; i++) {
Object result = msg.getPart(i).getObject();
List locations =
(List) result;
diff --git
a/geode-core/src/test/java/org/apache/geode/cache/client/internal/GetClientPRMetaDataOpJUnitTest.java
b/geode-core/src/test/java/org/apache/geode/cache/client/internal/GetClientPRMetaDataOpJUnitTest.java
new file mode 100644
index 000..535d794
--- /dev/null
+++
b/geode-core/src/test/java/org/apache/geode/cache/client/internal/GetClientPRMetaDataOpJUnitTest.java
@@ -0,0 +1,32 @@
+package org.apache.geode.cache.client.internal;
+
+import static org.junit.Assert.assertNull;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import org.junit.Test;
+
+import org.apache.geode.cache.Cache;
+import org.apache.geode.internal.cache.tier.MessageType;
+import org.apache.geode.internal.cache.tier.sockets.Message;
+
+public class GetClientPRMetaDataOpJUnitTest {
+ @Test
+ public void processResponseWhenCacheClosedShuouldReturnNull() throws
Exception {
+Cache cache = mock(Cache.class);
+ClientMetadataService cms = new ClientMetadataService(cache);
+cms = spy(cms);
+doReturn(true).when(cache).isClosed();
+
+Message msg = mock(Message.class);
+GetClientPRMetaDataOp.GetClientPRMetaDataOpImpl op =
+new GetClientPRMetaDataOp.GetClientPRMetaDataOpImpl("testRegion", cms);
+op = spy(op);
+
+
when(msg.getMessageType()).thenReturn(MessageType.RESPONSE_CLIENT_PR_METADATA);
+
+assertNull(op.processResponse(msg));
+ }
+}
[geode] branch feature/GEODE-6149 created (now b13401c)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-6149 in repository https://gitbox.apache.org/repos/asf/geode.git. at b13401c GEODE-6149: when client's cache is closing, its GetClientPRMetaDataOp could end up with NPE This branch includes the following new commits: new b13401c GEODE-6149: when client's cache is closing, its GetClientPRMetaDataOp could end up with NPE 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.
[geode-benchmarks] branch develop updated: Ignoring extra hosts in SshInfrastructure
This is an automated email from the ASF dual-hosted git repository.
upthewaterspout pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode-benchmarks.git
The following commit(s) were added to refs/heads/develop by this push:
new eb4dcab Ignoring extra hosts in SshInfrastructure
eb4dcab is described below
commit eb4dcabe1251433d0b363a1afe3a3eccbff7118f
Author: Dan Smith
AuthorDate: Tue Dec 4 15:07:29 2018 -0800
Ignoring extra hosts in SshInfrastructure
SshInfrastructure was trying to copy data to nodes that aren't needed,
resulting in failures if the user passed extra nodes.
---
.../ssh/SshInfrastructureFactory.java | 11 +---
.../ssh/SshInfrastructureFactoryTest.java} | 30 +++---
2 files changed, 17 insertions(+), 24 deletions(-)
diff --git
a/harness/src/main/java/org/apache/geode/perftest/infrastructure/ssh/SshInfrastructureFactory.java
b/harness/src/main/java/org/apache/geode/perftest/infrastructure/ssh/SshInfrastructureFactory.java
index 00ed0c5..f63cda2 100644
---
a/harness/src/main/java/org/apache/geode/perftest/infrastructure/ssh/SshInfrastructureFactory.java
+++
b/harness/src/main/java/org/apache/geode/perftest/infrastructure/ssh/SshInfrastructureFactory.java
@@ -19,13 +19,14 @@ package org.apache.geode.perftest.infrastructure.ssh;
import java.util.Arrays;
import java.util.Collection;
+import java.util.List;
import org.apache.geode.perftest.infrastructure.Infrastructure;
import org.apache.geode.perftest.infrastructure.InfrastructureFactory;
public class SshInfrastructureFactory implements InfrastructureFactory {
- private final Collection hosts;
+ private final List hosts;
private final String user;
public SshInfrastructureFactory(String user, String... hosts) {
@@ -34,8 +35,12 @@ public class SshInfrastructureFactory implements
InfrastructureFactory {
}
@Override
- public Infrastructure create(int nodes) throws Exception {
-return new SshInfrastructure(hosts, user);
+ public Infrastructure create(int nodes) {
+if (nodes > hosts.size()) {
+ throw new IllegalStateException(
+ "Not enough hosts to create " + nodes + " nodes. Available hosts: "
+ hosts);
+}
+return new SshInfrastructure(hosts.subList(0, nodes), user);
}
public Collection getHosts() {
diff --git
a/harness/src/main/java/org/apache/geode/perftest/infrastructure/ssh/SshInfrastructureFactory.java
b/harness/src/test/java/org/apache/geode/perftest/infrastructure/ssh/SshInfrastructureFactoryTest.java
similarity index 59%
copy from
harness/src/main/java/org/apache/geode/perftest/infrastructure/ssh/SshInfrastructureFactory.java
copy to
harness/src/test/java/org/apache/geode/perftest/infrastructure/ssh/SshInfrastructureFactoryTest.java
index 00ed0c5..9c929a1 100644
---
a/harness/src/main/java/org/apache/geode/perftest/infrastructure/ssh/SshInfrastructureFactory.java
+++
b/harness/src/test/java/org/apache/geode/perftest/infrastructure/ssh/SshInfrastructureFactoryTest.java
@@ -17,32 +17,20 @@
package org.apache.geode.perftest.infrastructure.ssh;
-import java.util.Arrays;
-import java.util.Collection;
+import org.assertj.core.api.Assertions;
+import org.junit.Test;
import org.apache.geode.perftest.infrastructure.Infrastructure;
-import org.apache.geode.perftest.infrastructure.InfrastructureFactory;
-public class SshInfrastructureFactory implements InfrastructureFactory {
+public class SshInfrastructureFactoryTest {
- private final Collection hosts;
- private final String user;
+ @Test
+ public void ignoresExtraHosts() {
+SshInfrastructureFactory factory =
+new SshInfrastructureFactory("user", "localhost", "localhost",
"localhost");
+Infrastructure infra = factory.create(2);
- public SshInfrastructureFactory(String user, String... hosts) {
-this.hosts = Arrays.asList(hosts);
-this.user = user;
+Assertions.assertThat(infra.getNodes()).hasSize(2);
}
- @Override
- public Infrastructure create(int nodes) throws Exception {
-return new SshInfrastructure(hosts, user);
- }
-
- public Collection getHosts() {
-return hosts;
- }
-
- public String getUser() {
-return user;
- }
}
[geode-benchmarks] branch develop updated: GEODE-6145: Allow multiple results for a single probe analyzer (#14)
This is an automated email from the ASF dual-hosted git repository.
wirebaron pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode-benchmarks.git
The following commit(s) were added to refs/heads/develop by this push:
new ef2e72f GEODE-6145: Allow multiple results for a single probe
analyzer (#14)
ef2e72f is described below
commit ef2e72fec401d6a801744f7a530d9c026c9d77b0
Author: Brian Rowe
AuthorDate: Wed Dec 5 09:59:39 2018 -0800
GEODE-6145: Allow multiple results for a single probe analyzer (#14)
This change modifies the ProbeResultParser interface to return a list of
ResultData objects. It takes advantage of this new functionality to return
6 results from the HDRHistogramParser (median latency, 90, 99, 99.9
percentile
latencies, average latency, and latency standard deviation). This is
probably
too noisy for the long run, but could prove useful as we evaluate different
platforms.
This change also changes the BenchmarkRunAnalyzer (invoked via gradlew
analyzeRun) to take the baseline directory as its first argument.
---
.../perftest/analysis/BenchmarkRunAnalyzer.java| 24 --
.../geode/perftest/analysis/ProbeResultParser.java | 17 +++
.../analysis/YardstickHdrHistogramParser.java | 19 +
.../analysis/YardstickPercentileSensorParser.java | 22 +---
.../analysis/YardstickThroughputSensorParser.java | 10 -
.../analysis/BenchmarkRunAnalyzerTest.java | 2 +-
6 files changed, 57 insertions(+), 37 deletions(-)
diff --git
a/harness/src/main/java/org/apache/geode/perftest/analysis/BenchmarkRunAnalyzer.java
b/harness/src/main/java/org/apache/geode/perftest/analysis/BenchmarkRunAnalyzer.java
index 764f622..57ae207 100644
---
a/harness/src/main/java/org/apache/geode/perftest/analysis/BenchmarkRunAnalyzer.java
+++
b/harness/src/main/java/org/apache/geode/perftest/analysis/BenchmarkRunAnalyzer.java
@@ -20,6 +20,7 @@ import java.nio.file.Files;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Iterator;
import java.util.List;
import java.util.stream.Collectors;
@@ -55,7 +56,7 @@ public class BenchmarkRunAnalyzer {
probes.add(probeResultParser);
}
- public BenchmarkRunResult analyzeTestRun(File testResultDir, File
baselineResultDir)
+ public BenchmarkRunResult analyzeTestRun(File baselineResultDir, File
testResultDir)
throws IOException {
List benchmarkDirs = Arrays.asList(testResultDir.listFiles());
benchmarkDirs.sort(File::compareTo);
@@ -72,22 +73,33 @@ public class BenchmarkRunAnalyzer {
final BenchmarkRunResult.BenchmarkResult benchmarkResult =
result.addBenchmark(testDir.getName());
for (ProbeResultParser probe : probes) {
-double testResult = getTestResult(testYardstickDirs, probe);
-double baselineResult = getTestResult(baselineYardstickDirs, probe);
+List testResults =
getTestResult(testYardstickDirs, probe);
+List baselineResults =
+getTestResult(baselineYardstickDirs, probe);
-benchmarkResult.addProbeResult(probe.getResultDescription(),
baselineResult, testResult);
+Iterator testResultIter =
testResults.iterator();
+Iterator baselineResultIter =
baselineResults.iterator();
+
+while (testResultIter.hasNext()) {
+ ProbeResultParser.ResultData testResult = testResultIter.next();
+ ProbeResultParser.ResultData baselineResult =
baselineResultIter.next();
+
+ benchmarkResult.addProbeResult(testResult.description,
baselineResult.value,
+ testResult.value);
+}
}
}
return result;
}
- private double getTestResult(List resultDirs, ProbeResultParser probe)
throws IOException {
+ private List getTestResult(List
resultDirs,
+ ProbeResultParser probe) throws IOException {
probe.reset();
for (File outputDirectory : resultDirs) {
probe.parseResults(outputDirectory);
}
-return probe.getProbeResult();
+return probe.getProbeResults();
}
private List getYardstickOutputForBenchmarkDir(File benchmarkDir)
throws IOException {
diff --git
a/harness/src/main/java/org/apache/geode/perftest/analysis/ProbeResultParser.java
b/harness/src/main/java/org/apache/geode/perftest/analysis/ProbeResultParser.java
index 1e94329..dd1935e 100644
---
a/harness/src/main/java/org/apache/geode/perftest/analysis/ProbeResultParser.java
+++
b/harness/src/main/java/org/apache/geode/perftest/analysis/ProbeResultParser.java
@@ -16,8 +16,10 @@ package org.apache.geode.perftest.analysis;
import java.io.File;
import java.io.IOException;
+import java.util.List;
public interface ProbeResultParser {
+
// Given a output directory for a benchmark, parse out the data for the
desired probe. Note that
// this method may be passed several csv files fo
[geode] branch develop updated: GEODE-6143: Change PowerMockito import to Mockito
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 eb829c6 GEODE-6143: Change PowerMockito import to Mockito eb829c6 is described below commit eb829c66985b4b11e3ad3ff520c2809adeb809e4 Author: Kirk Lund AuthorDate: Tue Dec 4 16:26:25 2018 -0800 GEODE-6143: Change PowerMockito import to Mockito This was accidental and it should have been importing from Mockito. --- .../logging/log4j/FastLoggerWithDefaultConfigIntegrationTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/logging/log4j/FastLoggerWithDefaultConfigIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/logging/log4j/FastLoggerWithDefaultConfigIntegrationTest.java index ebab71c..42c3daa 100755 --- a/geode-core/src/integrationTest/java/org/apache/geode/internal/logging/log4j/FastLoggerWithDefaultConfigIntegrationTest.java +++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/logging/log4j/FastLoggerWithDefaultConfigIntegrationTest.java @@ -17,7 +17,7 @@ package org.apache.geode.internal.logging.log4j; import static org.apache.geode.internal.logging.LogWriterLevel.INFO; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; -import static org.powermock.api.mockito.PowerMockito.when; +import static org.mockito.Mockito.when; import org.apache.logging.log4j.Logger; import org.junit.Before;
[geode-native] annotated tag rel/v1.8.0.RC2 updated (ae8c6b2 -> 90fd6b4)
This is an automated email from the ASF dual-hosted git repository. amurmann pushed a change to annotated tag rel/v1.8.0.RC2 in repository https://gitbox.apache.org/repos/asf/geode-native.git. *** WARNING: tag rel/v1.8.0.RC2 was modified! *** from ae8c6b2 (commit) to 90fd6b4 (tag) tagging ae8c6b2500ee8ffb600e5a295c053e9b2ac880ee (commit) replaces rel/v1.8.0.RC1 by Alexander Murmann on Wed Dec 5 09:00:06 2018 -0800 - Log - Release candidate 2 for 1.8.0 -BEGIN PGP SIGNATURE- iQIzBAABCAAdFiEE1cXJUNYYmO3okogg1gSDkr37d5cFAlwIBBYACgkQ1gSDkr37 d5cP6xAApZunxmt8Iqr6Hl1iZZeOJJSmAzM4Qh84fBsOR1JlFXNWem0a4Py3PUvC zVJeDgqcMoPCszohqcWiMuRSmBy7k1wA37Iq5N9n5ozt2q9yrQ4DdbDQPWHtQRcR QsA9VAgKS6B0A+mALPM59566MdLXCdEpCFFpoBOPtJwe1Qf/QqIg55NY+uP15k7X lNXr/PGAh8jpWMKWsTJyFk3QLMLWne8MjnYJ6yKwQi2avpUVUlli+NPJE1rhdvtf mUV9YZ6unoYTpr+yAQ/QlE2wFECJQPmzdMwiS3VL90aJLgxIP+QS48xG5A75xu0E y4BBvq5CTxdgvmd1vhgly4kvOvgjE9C+ThLhdV3b5SX/GJH93+BUSHhFcEe8akjz HkPx5AOmmHltvPvBlzg69StbHipUmcxrHAkJZStusJm3bEKxd8UoxA/ech2VLUZk loPeenGi+OoZkPeOHr8+dwBnLwneQTmhvtkp6xN/yZV3bXtdqLf5bA0W0uTU6s7R tLhSYhk49ExnxRctfI+S55Lu5sADADbj6SyU2f+0WofC/9YCoepBimK+x+dheeGK /WYVkDKuG5BgW18vxDzYkPcSvjteyvj1yrOb+qxUFgPjj/2Pgj9aOY1VFjF1Q29S 1dy+hlSmnCCY66zuyH/RMSN9Kihdm7lOOtuj/yYwFGEgJJJOQWw= =CJrQ -END PGP SIGNATURE- --- No new revisions were added by this update. Summary of changes:
[geode] branch develop updated: GEODE-6127 Document changes to gfsh create jndi-binding command (#2942)
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 b9c9966 GEODE-6127 Document changes to gfsh create jndi-binding command (#2942) b9c9966 is described below commit b9c9966fb544f4e7e5eae0af45fe57f6cab86220 Author: Karen Miller AuthorDate: Wed Dec 5 08:47:58 2018 -0800 GEODE-6127 Document changes to gfsh create jndi-binding command (#2942) * GEODE-6127 Document changes to gfsh create jndi-binding command * GEODE-6127 Revise docs for gfsh create jndi-binding updates per review --- .../tools_modules/gfsh/command-pages/create.html.md.erb | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/geode-docs/tools_modules/gfsh/command-pages/create.html.md.erb b/geode-docs/tools_modules/gfsh/command-pages/create.html.md.erb index ac7d182..fb536c4 100644 --- a/geode-docs/tools_modules/gfsh/command-pages/create.html.md.erb +++ b/geode-docs/tools_modules/gfsh/command-pages/create.html.md.erb @@ -704,8 +704,8 @@ JDBC connection. **Syntax:** ``` pre -create jndi-binding --name=value --type=value --jdbc-driver-class=value - --connection-url=value [--blocking-timeout-seconds=value] +create jndi-binding --name=value --url=value + [--jdbc-driver-class=value] [--type=value] [--blocking-timeout-seconds=value] [--conn-pooled-datasource-class=value] [--idle-timeout-seconds=value] [--init-pool-size=value] [--login-timeout-seconds=value] [--managed-conn-factory-class=value] [--max-pool-size=value] [--password=value] @@ -718,11 +718,11 @@ create jndi-binding --name=value --type=value --jdbc-driver-class=value | Name | Description | Default | |||-| | \\-\\-name | *Required.* Name of the binding to create. | | -| \\-\\-type | *Required.* Type of the XA datasource. One of: `MANAGED`, `SIMPLE`, `POOLED`, or `XAPOOLED`. | | -| \\-\\-jdbc-driver-class | *Required.* The fully qualified name of the JDBC driver class. | | -| \\-\\-connection-url | *Required.* the JDBC driver connection URL string. For example, `jdbc:hsqldb:hsql://localhost:1701`. | | +| ‑‑url or ‑‑connection-url | *Required.* the JDBC driver connection URL string. For example, `jdbc:hsqldb:hsql://localhost:1701`. | | +| \\-\\-jdbc-driver-class | The fully qualified name of the JDBC driver class. | | +| \\-\\-type | Type of the XA datasource. One of: `MANAGED`, `SIMPLE`, `POOLED`, or `XAPOOLED`. If `--type=POOLED` and a `--conn-pooled-datasource-class` option is not specified, a pool will be created using Hikari. For more information on Hikari, see [https://brettwooldridge.github.io/HikariCP](https://brettwooldridge.github.io/HikariCP). | `SIMPLE` | | \\-\\-blocking-timeout-seconds | Specifies the maximum time, in seconds, to block while waiting for a connection before throwing an exception.| | -| \\-\\-conn-pooled-datasource-class | The fully qualified name of the connection pool implementation that holds XA datasource connections. | | +| \\-\\-conn-pooled-datasource-class | The fully qualified name of the connection pool implementation that holds XA datasource connections. If `--type=POOLED`, then this class must implement `org.apache.geode.datasource.PooledDataSourceFactory`. | | | \\-\\-idle-timeout-seconds | Specifies the time, in seconds, that a connection may be idle before being closed. | | | \\-\\-init-pool-size | Specifies the initial number of connections the pool should hold. | | | \\-\\-login-timeout-seconds | The quantity of seconds after which the client thread will be disconnected due to inactivity. | | @@ -733,14 +733,14 @@ create jndi-binding --name=value --type=value --jdbc-driver-class=value | \\-\\-username | Specifies the default user name to be used when creating a new connection. | | | \\-\\-xa-datasource-class | The fully qualified name of the `javax.sql.XADataSource` implementation class. | | | \\-\\-if-not-exists | When true, a duplicate jndi binding will not be created if one with the same name already exists. When false, an attempt to create a duplicate jndi binding results in an error. The option is set to true if the optio
[geode-native] branch release/1.8 updated: GEODE-6139: Fix problems reported by rat in source release (#413)
This is an automated email from the ASF dual-hosted git repository.
igodwin pushed a commit to branch release/1.8
in repository https://gitbox.apache.org/repos/asf/geode-native.git
The following commit(s) were added to refs/heads/release/1.8 by this push:
new ae8c6b2 GEODE-6139: Fix problems reported by rat in source release
(#413)
ae8c6b2 is described below
commit ae8c6b2500ee8ffb600e5a295c053e9b2ac880ee
Author: Blake Bender
AuthorDate: Wed Dec 5 08:21:13 2018 -0800
GEODE-6139: Fix problems reported by rat in source release (#413)
* GEODE-6139: Fix problems reported by rat in source release
- Add missing license headers to a couple of files
- Tell rat to ignore some trivial config files
- Remove stray tmp file
- Fix cmake file that was badly reformatted
- Fix incorrect assumption in CMakeLists.txt
- .gitignore files use globbing, not regex, so they can't be read into
cpack ignore directly
Co-authored-by: Ernest Burghardt
Co-authored-by: Mike Martell
Co-authored-by: Jacob Barrett
---
.cpackignore | 17 +++-
.ratignore | 1 +
CMakeLists.txt | 4 +-
clicache/src/native_shared_ptr.hpp | 19 -
clicache/test/native_shared_ptrTests.cpp | Bin 12434 -> 6008 bytes
.../serialization/dotnet-serialization/t.tmp | 23 --
templates/security/CMakeLists.txt.forInstall | 86 ++---
7 files changed, 77 insertions(+), 73 deletions(-)
diff --git a/.cpackignore b/.cpackignore
index 5b3f03d..7881528 100644
--- a/.cpackignore
+++ b/.cpackignore
@@ -1,3 +1,16 @@
-/.git/
-/.DS_Store
+/\.git/
+/\.DS_Store
+/build-.*/
+
+/build/
+/\.settings/
+/\.cproject
+/\.project
+/\.idea/
+\.vs/
+\.vscode/
+
+/examples/dotnet/.*/bin/
+/examples/dotnet/.*/obj/
+\.ruby-version
diff --git a/.ratignore b/.ratignore
index 7da9249..108dbb7 100644
--- a/.ratignore
+++ b/.ratignore
@@ -3,6 +3,7 @@
.*\.clang-tidy$
.*\.gitignore$
.*\.ratignore$
+
.*md$
.*json$
.*deprecated_xml_instructions.txt$
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ecd902d..4b34ca6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -122,10 +122,8 @@ set(CPACK_PACKAGE_CHECKSUM "SHA512")
# leave out .git and a couple other items we want in the repository but not in
# the release. Everything gets concatenated into a ';' separated list for
# cpack.
-file(READ ".gitignore" IGNORED_PARTIAL)
-set(IGNORED_FULL ${IGNORED_PARTIAL})
file(READ ".cpackignore" IGNORED_PARTIAL)
-string(CONCAT IGNORED_FULL ${IGNORED_FULL} ${IGNORED_PARTIAL})
+set(IGNORED_FULL ${IGNORED_PARTIAL})
string(REGEX REPLACE "\n" ";" IGNORED_FULL "${IGNORED_FULL}")
string(REGEX REPLACE " " "" IGNORED_FULL "${IGNORED_FULL}")
diff --git a/clicache/src/native_shared_ptr.hpp
b/clicache/src/native_shared_ptr.hpp
index ed1f539..e01cbe3 100644
--- a/clicache/src/native_shared_ptr.hpp
+++ b/clicache/src/native_shared_ptr.hpp
@@ -1,3 +1,20 @@
+/*
+ * 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.
+ */
+
#pragma once
@@ -39,4 +56,4 @@ namespace Apache
};
}
}
-}
\ No newline at end of file
+}
diff --git a/clicache/test/native_shared_ptrTests.cpp
b/clicache/test/native_shared_ptrTests.cpp
index 46bb70d..59e7b9d 100644
Binary files a/clicache/test/native_shared_ptrTests.cpp and
b/clicache/test/native_shared_ptrTests.cpp differ
diff --git a/docs/geode-native-docs/serialization/dotnet-serialization/t.tmp
b/docs/geode-native-docs/serialization/dotnet-serialization/t.tmp
deleted file mode 100644
index a2b297b..000
--- a/docs/geode-native-docs/serialization/dotnet-serialization/t.tmp
+++ /dev/null
@@ -1,23 +0,0 @@
-./
-../
-custom-class-igfserializable.html.md.erb
-dotnet-data-serialization-options.html.md.erb
-dotnet-data-serialization.html.md.erb
-dotnet-data-serialization.html.md.erb~
-dotnet-pdx-autoserializer.html.md.erb
-dotnet-pdx-serialization-features.html.md.erb
-dotnet-pdx-serialization.html.md.erb
-extending-pdx-autoserializer.html.md.erb
-how-igfserializable-works.html.md.erb
-implementing-igfserializable.html.md.erb
-mapping-dotnet-domain-type-names.html.md.erb
-mapping-dotnet-d
[geode-native] branch develop updated: GEODE-6139: Fix problems reported by rat in source release (#413)
This is an automated email from the ASF dual-hosted git repository.
bbender 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 0f472e3 GEODE-6139: Fix problems reported by rat in source release
(#413)
0f472e3 is described below
commit 0f472e37a63fd915dbc5877aa3c73e5c479c3579
Author: Blake Bender
AuthorDate: Wed Dec 5 08:21:13 2018 -0800
GEODE-6139: Fix problems reported by rat in source release (#413)
* GEODE-6139: Fix problems reported by rat in source release
- Add missing license headers to a couple of files
- Tell rat to ignore some trivial config files
- Remove stray tmp file
- Fix cmake file that was badly reformatted
- Fix incorrect assumption in CMakeLists.txt
- .gitignore files use globbing, not regex, so they can't be read into
cpack ignore directly
Co-authored-by: Ernest Burghardt
Co-authored-by: Mike Martell
Co-authored-by: Jacob Barrett
---
.cpackignore | 17 +--
.ratignore | 1 +
CMakeLists.txt | 4 +---
clicache/src/native_shared_ptr.hpp | 4 ++--
clicache/test/native_shared_ptrTests.cpp | Bin 12434 -> 6008 bytes
.../serialization/dotnet-serialization/t.tmp | 23 -
templates/security/CMakeLists.txt.forInstall | 11 +-
7 files changed, 25 insertions(+), 35 deletions(-)
diff --git a/.cpackignore b/.cpackignore
index 5b3f03d..7881528 100644
--- a/.cpackignore
+++ b/.cpackignore
@@ -1,3 +1,16 @@
-/.git/
-/.DS_Store
+/\.git/
+/\.DS_Store
+/build-.*/
+
+/build/
+/\.settings/
+/\.cproject
+/\.project
+/\.idea/
+\.vs/
+\.vscode/
+
+/examples/dotnet/.*/bin/
+/examples/dotnet/.*/obj/
+\.ruby-version
diff --git a/.ratignore b/.ratignore
index c3db593..0f9c4ba 100644
--- a/.ratignore
+++ b/.ratignore
@@ -5,6 +5,7 @@
.*\.gitignore$
.*\.lcovrc$
.*\.ratignore$
+
.*md$
.*json$
.*deprecated_xml_instructions.txt$
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6553d3f..1ae923b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -122,10 +122,8 @@ set(CPACK_PACKAGE_CHECKSUM "SHA512")
# leave out .git and a couple other items we want in the repository but not in
# the release. Everything gets concatenated into a ';' separated list for
# cpack.
-file(READ ".gitignore" IGNORED_PARTIAL)
-set(IGNORED_FULL ${IGNORED_PARTIAL})
file(READ ".cpackignore" IGNORED_PARTIAL)
-string(CONCAT IGNORED_FULL ${IGNORED_FULL} ${IGNORED_PARTIAL})
+set(IGNORED_FULL ${IGNORED_PARTIAL})
string(REGEX REPLACE "\n" ";" IGNORED_FULL "${IGNORED_FULL}")
string(REGEX REPLACE " " "" IGNORED_FULL "${IGNORED_FULL}")
diff --git a/clicache/src/native_shared_ptr.hpp
b/clicache/src/native_shared_ptr.hpp
index c488b9c..e01cbe3 100644
--- a/clicache/src/native_shared_ptr.hpp
+++ b/clicache/src/native_shared_ptr.hpp
@@ -15,7 +15,7 @@
* limitations under the License.
*/
- #pragma once
+#pragma once
#include "begin_native.hpp"
@@ -56,4 +56,4 @@ namespace Apache
};
}
}
-}
\ No newline at end of file
+}
diff --git a/clicache/test/native_shared_ptrTests.cpp
b/clicache/test/native_shared_ptrTests.cpp
index 46bb70d..59e7b9d 100644
Binary files a/clicache/test/native_shared_ptrTests.cpp and
b/clicache/test/native_shared_ptrTests.cpp differ
diff --git a/docs/geode-native-docs/serialization/dotnet-serialization/t.tmp
b/docs/geode-native-docs/serialization/dotnet-serialization/t.tmp
deleted file mode 100644
index a2b297b..000
--- a/docs/geode-native-docs/serialization/dotnet-serialization/t.tmp
+++ /dev/null
@@ -1,23 +0,0 @@
-./
-../
-custom-class-igfserializable.html.md.erb
-dotnet-data-serialization-options.html.md.erb
-dotnet-data-serialization.html.md.erb
-dotnet-data-serialization.html.md.erb~
-dotnet-pdx-autoserializer.html.md.erb
-dotnet-pdx-serialization-features.html.md.erb
-dotnet-pdx-serialization.html.md.erb
-extending-pdx-autoserializer.html.md.erb
-how-igfserializable-works.html.md.erb
-implementing-igfserializable.html.md.erb
-mapping-dotnet-domain-type-names.html.md.erb
-mapping-dotnet-domain-type-names.html.md.erb~
-programming-ipdxinstance.html.md.erb
-registering-the-type.html.md.erb
-serializable-types.html.md.erb
-serialize-using-igfserializable.html.md.erb
-serialize-using-ipdxserializable.html.md.erb
-serializing-domain-objects.html.md.erb
-t.tmp
-using-ipdxinstancefactory.html.md.erb
-using-ipdxinstancefactory.html.md.erb~
diff --git a/templates/security/CMakeLists.txt.forInstall
b/templates/security/CMakeLists.txt.forInstall
index 166524e..9662c22 100644
--- a/templates/security/CMakeLists.txt.forInstall
+++ b/templates/security/CMakeLists.txt.forInstall
@@ -17,7 +17,7 @@
cmake_minimum_required(VERSION 3.4)
project(templates.security)
-find_package(OpenSSL 1.0.2 REQUIRED)
+find_package(Ope
[geode] branch develop updated (6a0e08b -> 3a4a932)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from 6a0e08b GEODE-6107: in test start locators one at a time (#2933) add 322628f Fix ZipSlip bug found by LGTM.com new 3a4a932 Merge pull request #2948 from samlanning/zip-slip 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: .../geode/management/internal/configuration/utils/ZipUtils.java | 9 ++--- 1 file changed, 6 insertions(+), 3 deletions(-)
[geode] 01/01: Merge pull request #2948 from samlanning/zip-slip
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 commit 3a4a932b8e34887c7af13a96c087f27ebdfd255d Merge: 6a0e08b 322628f Author: Bruce Schuchardt AuthorDate: Wed Dec 5 07:59:47 2018 -0800 Merge pull request #2948 from samlanning/zip-slip Fix ZipSlip bug found by LGTM.com .../geode/management/internal/configuration/utils/ZipUtils.java | 9 ++--- 1 file changed, 6 insertions(+), 3 deletions(-)
