Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GEODE-10278: Remove the geode-for-redis module #7657

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
5 changes: 0 additions & 5 deletions CODEOWNERS
Validating CODEOWNERS rules …
Expand Up @@ -283,11 +283,6 @@ geode-assembly/**/org/apache/geode/rules/** @jdeppe-pivota
geode-assembly/**/org/apache/geode/launchers/** @dschneider-pivotal @boglesby @nabarunnag
geode-assembly/**/resources/** @boglesby @nabarunnag @jdeppe-pivotal @jinmeiliao

#-----------------------------------------------------------------
# Redis API
#-----------------------------------------------------------------
geode-for-redis/** @jdeppe-pivotal @nonbinaryprogrammer @ringles @upthewaterspout @DonalEvans @dschneider-pivotal

#-----------------------------------------------------------------
# Build and tooling
#-----------------------------------------------------------------
Expand Down
1 change: 0 additions & 1 deletion README.md
Expand Up @@ -207,7 +207,6 @@ Apache Geode applications can be written in these client technologies:
or [peer](https://geode.apache.org/docs/guide/18/topologies_and_comm/p2p_configuration/chapter_overview.html)
* [REST](https://geode.apache.org/docs/guide/18/rest_apps/chapter_overview.html)
* [Memcached](https://cwiki.apache.org/confluence/display/GEODE/Moving+from+memcached+to+gemcached)
* [Redis](https://cwiki.apache.org/confluence/display/GEODE/Geode+Redis+Adapter)

The following libraries are available external to the Apache Geode project:

Expand Down
31 changes: 0 additions & 31 deletions boms/geode-all-bom/src/test/resources/expected-pom.xml
Expand Up @@ -442,11 +442,6 @@
<artifactId>JUnitParams</artifactId>
<version>1.1.0</version>
</dependency>
<dependency>
<groupId>redis.clients</groupId>
<artifactId>jedis</artifactId>
<version>4.1.1</version>
</dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
Expand Down Expand Up @@ -612,16 +607,6 @@
<artifactId>junit-vintage-engine</artifactId>
<version>5.8.2</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-redis</artifactId>
<version>4.1.76.Final</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
<version>4.1.76.Final</version>
</dependency>
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-api</artifactId>
Expand Down Expand Up @@ -747,16 +732,6 @@
<artifactId>spring-boot-starter-web</artifactId>
<version>2.6.7</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-redis</artifactId>
<version>2.6.7</version>
</dependency>
<dependency>
<groupId>org.springframework.session</groupId>
<artifactId>spring-session-data-redis</artifactId>
<version>2.6.2</version>
</dependency>
<dependency>
<groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId>
Expand Down Expand Up @@ -798,12 +773,6 @@
<version>${version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-for-redis</artifactId>
<version>${version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-gfsh</artifactId>
Expand Down
Expand Up @@ -170,7 +170,6 @@ class DependencyConstraints implements Plugin<Project> {
api(group: 'org.springframework.shell', name: 'spring-shell', version: get('springshell.version'))
api(group: 'org.testcontainers', name: 'testcontainers', version: '1.15.3')
api(group: 'pl.pragmatists', name: 'JUnitParams', version: '1.1.0')
api(group: 'redis.clients', name: 'jedis', version: '4.1.1')
api(group: 'xerces', name: 'xercesImpl', version: '2.12.0')
api(group: 'xml-apis', name: 'xml-apis', version: '1.4.01')
api(group: 'org.junit-pioneer', name: 'junit-pioneer', version: '1.6.2')
Expand Down Expand Up @@ -246,11 +245,6 @@ class DependencyConstraints implements Plugin<Project> {
entry('junit-vintage-engine')
}

dependencySet(group: 'io.netty', version: '4.1.76.Final') {
entry('netty-codec-redis')
entry('netty-handler')
}

dependencySet(group: 'org.seleniumhq.selenium', version: '3.141.59') {
entry('selenium-api')
entry('selenium-chrome-driver')
Expand Down Expand Up @@ -286,11 +280,6 @@ class DependencyConstraints implements Plugin<Project> {
entry('spring-boot-starter')
entry('spring-boot-starter-jetty')
entry('spring-boot-starter-web')
entry('spring-boot-starter-data-redis')
}

dependencySet(group: 'org.springframework.session', version: '2.6.2') {
entry('spring-session-data-redis')
}

dependencySet(group: 'org.jetbrains', version: '23.0.0') {
Expand Down
21 changes: 0 additions & 21 deletions ci/pipelines/shared/jinja.variables.yml
Expand Up @@ -35,13 +35,6 @@ benchmarks:
options: '--tests=org.apache.geode.benchmark.tests.Partitioned*'
max_in_flight: 2
timeout: 10h
- title: 'radish'
baseline_branch: 'geode-for-redis-benchmark-baseline'
baseline_version: ''
flag: '-PtestJVM=/usr/lib/jvm/bellsoft-java11-amd64 -Pbenchmark.withRedisCluster=geode -Pbenchmark.withServerCount=2'
options: '--tests=org.apache.geode.benchmark.redis.tests.*'
max_in_flight: 2
timeout: 10h

build_test:
ARTIFACT_SLUG: build
Expand Down Expand Up @@ -159,20 +152,6 @@ tests:
PLATFORM: linux
RAM: '210'
name: upgrade
- ARTIFACT_SLUG: redistests
CALL_STACK_TIMEOUT: '1200'
CPUS: '4'
DISK: '200GB'
DUNIT_PARALLEL_FORKS: '0'
EXECUTE_TEST_TIMEOUT: 30m
GRADLE_TASK: ':geode-for-redis:redisAPITest'
MAX_IN_FLIGHT: 1
ONLY_JDK: 11
PARALLEL_DUNIT: 'false'
PARALLEL_GRADLE: 'true'
PLATFORM: linux
RAM: '8'
name: redis
- ARTIFACT_SLUG: stressnewtestfiles
CALL_STACK_TIMEOUT: '35100'
CPUS: '96'
Expand Down
92 changes: 0 additions & 92 deletions ci/scripts/execute_redis_tests.sh

This file was deleted.

5 changes: 0 additions & 5 deletions ci/scripts/execute_tests.sh
Expand Up @@ -37,11 +37,6 @@ fi
. ${SCRIPTDIR}/shared_utilities.sh
is_source_from_pr_testable "geode" "$(get_geode_pr_exclusion_dirs)" || exit 0

if [ "${GRADLE_TASK}" = ":geode-for-redis:redisAPITest" ] && ! grep -q redisAPITest geode/geode-for-redis/build.gradle ; then
echo "redisAPITest is not applicable for 1.13 and earlier"
exit 0
fi

REPODIR=$(cd geode; git rev-parse --show-toplevel)

if [[ ${PARALLEL_GRADLE:-"true"} == "true" ]]; then
Expand Down
1 change: 0 additions & 1 deletion geode-assembly/build.gradle
Expand Up @@ -523,7 +523,6 @@ distributions {
from { project(':extensions:geode-modules-assembly').distTcServer30 }
from { project(':extensions:geode-modules-assembly').distTomcat }
from { project(':extensions:geode-modules-assembly').distAppServer }
from { project(':geode-for-redis').distZip }
}
}
}
Expand Down
Expand Up @@ -1068,5 +1068,4 @@ tools/Modules/Apache_Geode_Modules-0.0.0-AppServer.zip
tools/Modules/Apache_Geode_Modules-0.0.0-Tomcat.zip
tools/Modules/Apache_Geode_Modules-0.0.0-tcServer.zip
tools/Modules/Apache_Geode_Modules-0.0.0-tcServer30.zip
tools/Modules/geode-for-redis-0.0.0.zip
tools/Pulse/geode-pulse-0.0.0.war
3 changes: 0 additions & 3 deletions geode-book/master_middleman/source/subnavs/geode-subnav.erb
Expand Up @@ -2105,9 +2105,6 @@ limitations under the License.
</li>
</ul>
</li>
<li>
<a href="/docs/guide/<%=vars.product_version_nodot%>/tools_modules/geode_for_redis.html">Geode for Redis</a>
</li>
<li class="has_submenu">
<a href="/docs/guide/<%=vars.product_version_nodot%>/tools_modules/gemcached/chapter_overview.html">Gemcached</a>
<ul>
Expand Down
9 changes: 0 additions & 9 deletions geode-docs/getting_started/intro_to_clients.html.md.erb
Expand Up @@ -331,12 +331,3 @@ int main(int argc, char** argv) {
- [Apache Geode Native Client Examples GitHub Repo](https://github.com/apache/geode-native/tree/develop/examples)
- [Apache Geode Native C++ Client Documentation](https://geode.apache.org/docs/)
- [Apache Geode Native Client C++ API Reference](https://geode.apache.org/releases/latest/cppdocs/hierarchy.html)

## <a id="client-intro-redis"></a><%=vars.product_name%> for Redis

<%=vars.product_name%> for Redis allows <%=vars.product_name_long%> to function as a drop-in replacement for a
highly-available Redis data store, letting Redis applications take advantage of
<%=vars.product_name_long%>’s scaling capabilities without changing their client code.

Note: This feature is experimental and is subject to change in future releases of <%=vars.product_name_long%>.
See [<%=vars.product_name%> for Redis](../tools_modules/geode_for_redis.html) for current information regarding these APIs.
20 changes: 0 additions & 20 deletions geode-docs/reference/topics/gemfire_properties.html.md.erb
Expand Up @@ -487,26 +487,6 @@ off-heap-memory-size=120g</code></pre></td>
<td><em>not set</em></td>
</tr>
<tr>
<td>geode-for-redis-bind-address</td>
<td>Specifies the address on which <%=vars.product_name%> for Redis is listening. If set to the empty string or this property is not
specified, the server listens on all local addresses.
<td>S</td>
<td><code>""</code></td>
</tr>
<tr>
<td>geode-for-redis-enabled</td>
<td>When the default value of false, <%=vars.product_name%> for Redis is not available. Set
to true to enable <%=vars.product_name%> for Redis.</td>
<td>S</td>
<td>false</td>
</tr>
<tr>
<td>geode-for-redis-port</td>
<td>Specifies the port on which the server listens for <%=vars.product_name%> for Redis connections. A value of 0 selects a random port.</td>
<td>S</td>
<td>6379</td>
</tr>
<tr>
<td>redundancy-zone</td>
<td>Defines this member's redundancy zone. Used to separate member's into different groups for satisfying partitioned region redundancy. If this property is set, <%=vars.product_name%> will not put redundant copies of data in members with the same redundancy zone setting.
See <a href="../../developing/partitioned_regions/configuring_ha_for_pr.html">Configure High Availability for a Partitioned Region</a> for more details.</td>
Expand Down
8 changes: 0 additions & 8 deletions geode-docs/tools_modules/book_intro.html.md.erb
Expand Up @@ -27,14 +27,6 @@ limitations under the License.

`gfsh` (pronounced "jee-fish") provides a single, powerful command-line interface from which you can launch, manage, and monitor <%=vars.product_name%> processes, data, and applications.

- **[<%=vars.product_name%> for Redis](geode_for_redis.html)**

<%=vars.product_name%> for Redis allows <%=vars.product_name%> to function
as a drop-in replacement for a Redis data store, letting Redis applications take advantage of
<%=vars.product_name%>’s scaling capabilities without changing their client code. Redis clients
connect to a <%=vars.product_name%> server in the same way they connect to a Redis server, using
a hostname and a port number.

- **[Gemcached](gemcached/chapter_overview.html)**

Gemcached is a <%=vars.product_name%> adapter that allows Memcached clients to communicate with a <%=vars.product_name%> server cluster, as if the servers were memcached servers. Memcached is an open-source caching solution that uses a distributed, in-memory hash map to store key-value pairs of string or object data.
Expand Down