Skip to content

Commit 4bf9420

Browse files
committed
Revert "Improve Command parsing to consider navigation key stops when determining conditionKeys and orderKeys (#546)"
This reverts commit e29b808.
1 parent 0bea7fd commit 4bf9420

File tree

3 files changed

+0
-86
lines changed

3 files changed

+0
-86
lines changed

CHANGELOG.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@
1313
* **Dynamic Memory-Aware Eviction**: Record caches in the database now evict entires based on overall memory consumption instead of evicting after exceeding a static number of entries. Caches can grow up to an internally defined proportion of the defined `heap_size` and will be purged once this limit is exceeded or when system memory pressure necessitates garbage collection.
1414
* **Enhanced Diagnostic Logging**: For improved observability, DEBUG logging now emits messages whenever a cached record is evicted, allowing for more effective monitoring and troubleshooting of cache behavior.
1515

16-
##### General Improvements and Bug Fixes
17-
* Fixed an issue that occurred when using a navigation key in a Criteria/Condition that was passed as a parameter to a Concourse Server command. Previously, the individual stops of navigation keys were not individually registered as *condition keys*. As a result, the `Strategy` framework didn't have all the relevant information to accurately determine all the ideal lookup sources when traversing the document graph to retrieve the values along the path. Now, in addition to the entire navigation key, each individual stop is registered as a *condition key*, which means that the `Strategy` framework will have enough information to determine if more efficient to use any index data (as opposed to table data) for lookups.
18-
1916
#### Version 0.11.7 (April 7, 2025)
2017
* Fixed a bug that made it possible to leak filesystem resources by opening duplicate file descriptors for the same Segment file. At scale, this could prematurely lead to "too many open files" errors.
2118
* [GH-534](https://github.com/cinchapi/concourse/issues/534): Fixed a bug that caused the `CONCOURSE_HEAP_SIZE` environment variable, if set, not to be read on server startup.

concourse-server/src/main/java/com/cinchapi/concourse/server/ops/Command.java

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import java.util.Map;
2323
import java.util.Set;
2424
import java.util.stream.Collectors;
25-
import java.util.stream.Stream;
2625

2726
import javax.annotation.Nonnull;
2827
import javax.annotation.Nullable;
@@ -41,9 +40,6 @@
4140
import com.cinchapi.concourse.thrift.JavaThriftBridge;
4241
import com.cinchapi.concourse.thrift.TCriteria;
4342
import com.cinchapi.concourse.thrift.TOrder;
44-
import com.cinchapi.concourse.validate.Keys;
45-
import com.cinchapi.concourse.validate.Keys.Key;
46-
import com.cinchapi.concourse.validate.Keys.KeyType;
4743
import com.google.common.base.CaseFormat;
4844
import com.google.common.base.MoreObjects;
4945
import com.google.common.base.MoreObjects.ToStringHelper;
@@ -52,7 +48,6 @@
5248
import com.google.common.collect.ImmutableSet;
5349
import com.google.common.collect.Multimap;
5450
import com.google.common.collect.Sets;
55-
import com.google.common.collect.Streams;
5651

5752
/**
5853
* A {@link Command} describes a {@link ConcourseServer} operation and the
@@ -464,20 +459,6 @@ else if(conditionKeys == null) {
464459
conditionKeys = ImmutableSet.of();
465460
}
466461

467-
// If any of the #conditionKeys are navigation keys, break them up
468-
// and add each stop as a condition key
469-
if(!conditionKeys.isEmpty()) {
470-
conditionKeys = conditionKeys.stream().flatMap($key -> {
471-
Key key = Keys.parse($key);
472-
Stream<String> stream = Stream.of($key);
473-
if(key.type() == KeyType.NAVIGATION_KEY) {
474-
String[] stops = key.data();
475-
stream = Streams.concat(stream, Arrays.stream(stops));
476-
}
477-
return stream;
478-
}).collect(Collectors.toSet());
479-
}
480-
481462
// operationTimestamp
482463
if(args.containsKey("time")) {
483464
operationTimestamp = args.fetch("time");

concourse-server/src/test/java/com/cinchapi/concourse/server/ops/CommandTest.java

Lines changed: 0 additions & 64 deletions
This file was deleted.

0 commit comments

Comments
 (0)