Skip to content

Remove trademarked language in code comments#223

Merged
zuiderkwast merged 9 commits into
valkey-io:unstablefrom
murphyjacob4:comments_trademarks
Apr 9, 2024
Merged

Remove trademarked language in code comments#223
zuiderkwast merged 9 commits into
valkey-io:unstablefrom
murphyjacob4:comments_trademarks

Conversation

@murphyjacob4

Copy link
Copy Markdown
Contributor

Strategy for replacement:

  • Regex search: (//|/\*| \*|#).* ("|\()?(r|R)edis( |\. |'|\n|,|-|\)|")(?!nor the names of its contributors)(?!Ltd.)(?!Labs)(?!Contributors.)
  • Don't edit copyright comments
  • Replace "Redis version X.X" -> "Redis OSS version X.X" to distinguish from newly licensed repository
  • Replace "Redis Object" -> "Object"
  • Exclude markdown for now
  • Don''t edit Lua scripting comments referring to redis.X API
  • Replace "Redis Protocol" -> "RESP"
  • Replace redis-benchmark, -cli, -server, -check-aof/rdb with "valkey-" prefix
  • Most other places, I use best judgement to either remove "Redis", or replace with "the server" or "server"

Fixes #148

@murphyjacob4 murphyjacob4 force-pushed the comments_trademarks branch from 22d4b81 to 380e17b Compare April 5, 2024 16:31

@zuiderkwast zuiderkwast left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Partial review. I made it to the middle of module.c so far.

Comment thread deps/Makefile Outdated
Comment thread deps/hiredis/.github/workflows/test.yml Outdated
Comment thread deps/jemalloc/include/jemalloc/jemalloc_macros.h.in Outdated
Comment thread src/acl.c
Comment thread src/db.c
Comment thread src/dict.c Outdated
Comment thread src/eval.c Outdated
Comment thread src/module.c Outdated
@murphyjacob4 murphyjacob4 force-pushed the comments_trademarks branch from e1e1bec to d825ce2 Compare April 5, 2024 19:33

@zuiderkwast zuiderkwast left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I went through all of it now. Thanks for this massive work!

I'm sorry you got merge conflicts now, probably a lot of them. I hope they're easy to solve though.

Comment thread src/module.c Outdated
Comment thread src/module.c Outdated
Comment thread src/networking.c Outdated
Comment thread src/sentinel.c Outdated
Comment thread src/server.h Outdated
Comment thread tests/integration/logging.tcl Outdated
Comment thread tests/unit/scan.tcl
Comment thread src/cluster_legacy.c Outdated
Signed-off-by: Jacob Murphy <jkmurphy@google.com>
@murphyjacob4 murphyjacob4 force-pushed the comments_trademarks branch from 59d4fee to 0596f0b Compare April 7, 2024 19:57
@murphyjacob4

Copy link
Copy Markdown
Contributor Author

Thanks for the thorough review! Merge conflicts weren't too bad

murphyjacob4 and others added 4 commits April 7, 2024 20:15
Signed-off-by: Jacob Murphy <jkmurphy@google.com>
Signed-off-by: Jacob Murphy <jkmurphy@google.com>
Signed-off-by: Jacob Murphy <jkmurphy@google.com>

Co-authored-by: Viktor Söderqvist <viktor.soderqvist@est.tech>
Signed-off-by: Jacob Murphy <jkmurphy@google.com>

Co-authored-by: Viktor Söderqvist <viktor.soderqvist@est.tech>
@murphyjacob4 murphyjacob4 force-pushed the comments_trademarks branch from 22768c3 to 366ea33 Compare April 7, 2024 20:15
@zuiderkwast

Copy link
Copy Markdown
Contributor

Please check the failed CI jobs. It seems some merge conflicts were not solved in the right way...

Signed-off-by: Jacob Murphy <jkmurphy@google.com>
Signed-off-by: Jacob Murphy <jkmurphy@google.com>
@murphyjacob4

Copy link
Copy Markdown
Contributor Author

Yeah building is important... :)

Had a comment that got double terminated after the merge. make and make test should be fixed now

Signed-off-by: Jacob Murphy <jkmurphy@google.com>
@murphyjacob4

Copy link
Copy Markdown
Contributor Author

Resolved some more merge conflicts

@zuiderkwast zuiderkwast left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Really awesome. I'll try to merge this fast before any other changes to avoid more merge conflict.

Comment thread src/module.c Outdated
Signed-off-by: Viktor Söderqvist
@zuiderkwast zuiderkwast merged commit df5db06 into valkey-io:unstable Apr 9, 2024
PatrickJS pushed a commit to PatrickJS/placeholderkv that referenced this pull request Apr 24, 2024
This includes comments used for module API documentation.

* Strategy for replacement: Regex search: `(//|/\*| \*|#).* ("|\()?(r|R)edis( |\.
  |'|\n|,|-|\)|")(?!nor the names of its contributors)(?!Ltd.)(?!Labs)(?!Contributors.)`
* Don't edit copyright comments
* Replace "Redis version X.X" -> "Redis OSS version X.X" to distinguish
from newly licensed repository
* Replace "Redis Object" -> "Object"
* Exclude markdown for now
* Don't edit Lua scripting comments referring to redis.X API
* Replace "Redis Protocol" -> "RESP"
* Replace redis-benchmark, -cli, -server, -check-aof/rdb with "valkey-"
prefix
* Most other places, I use best judgement to either remove "Redis", or
replace with "the server" or "server"

Fixes valkey-io#148

---------

Signed-off-by: Jacob Murphy <jkmurphy@google.com>
Signed-off-by: Viktor Söderqvist <viktor.soderqvist@est.tech>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Occurrences of "Redis" in comments

2 participants