Skip to content

Commit 155145b

Browse files
DATAREDIS-425 - Unify case of keyspace.
1 parent 69c47eb commit 155145b

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

src/main/java/org/springframework/data/redis/core/IndexWriter.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ private void removeKeyFromExistingIndexes(byte[] key, Iterable<IndexedData> inde
123123
protected void removeKeyFromExistingIndexes(byte[] key, IndexedData indexedData) {
124124

125125
Assert.notNull(indexedData, "IndexedData must not be null!");
126-
Set<byte[]> existingKeys = connection.keys(toBytes(indexedData.getKeySpace() + ":" + indexedData.getIndexName()
126+
Set<byte[]> existingKeys = connection.keys(toBytes(indexedData.getKeyspace() + ":" + indexedData.getIndexName()
127127
+ ":*"));
128128

129129
if (!CollectionUtils.isEmpty(existingKeys)) {
@@ -159,12 +159,12 @@ protected void addKeyToIndex(byte[] key, IndexedData indexedData) {
159159
return;
160160
}
161161

162-
byte[] indexKey = toBytes(indexedData.getKeySpace() + ":" + indexedData.getIndexName() + ":");
162+
byte[] indexKey = toBytes(indexedData.getKeyspace() + ":" + indexedData.getIndexName() + ":");
163163
indexKey = ByteUtils.concat(indexKey, toBytes(value));
164164
connection.sAdd(indexKey, key);
165165

166166
// keep track of indexes used for the object
167-
connection.sAdd(ByteUtils.concatAll(toBytes(indexedData.getKeySpace() + ":"), key, toBytes(":idx")), indexKey);
167+
connection.sAdd(ByteUtils.concatAll(toBytes(indexedData.getKeyspace() + ":"), key, toBytes(":idx")), indexKey);
168168
} else {
169169
throw new IllegalArgumentException(String.format("Cannot write index data for unknown index type %s",
170170
indexedData.getClass()));

src/main/java/org/springframework/data/redis/core/convert/IndexedData.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,6 @@ public interface IndexedData {
3636
*
3737
* @return
3838
*/
39-
String getKeySpace();
39+
String getKeyspace();
4040

4141
}

src/main/java/org/springframework/data/redis/core/convert/SimpleIndexedPropertyValue.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public String getIndexName() {
6767
* @see org.springframework.data.redis.core.convert.IndexedData#getKeySpace()
6868
*/
6969
@Override
70-
public String getKeySpace() {
70+
public String getKeyspace() {
7171
return this.keyspace;
7272
}
7373

src/test/java/org/springframework/data/redis/core/IndexWriterUnitTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ public String getIndexName() {
186186
}
187187

188188
@Override
189-
public String getKeySpace() {
189+
public String getKeyspace() {
190190
return KEYSPACE;
191191
}
192192
}

0 commit comments

Comments
 (0)