Skip to content

Commit c9586d1

Browse files
committed
DfsReaderOptions: read loadRevIndexInParallel from config
The options have the field but it isn't loaded from the config. This forces a workaround downstream. Read the option from the config, as the others. Change-Id: I7720812e0577d8f45f6b7f5b8495a8b64729125e
1 parent ac7cbfd commit c9586d1

File tree

3 files changed

+12
-0
lines changed

3 files changed

+12
-0
lines changed

Documentation/config-options.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ For details on native git options see also the official [git config documentatio
3131
| `core.dfs.blockSize` | `64 kiB` | ⃞ | Size in bytes of a single window read in from the pack file into the DFS block cache. |
3232
| `core.dfs.concurrencyLevel` | `32` | ⃞ | The estimated number of threads concurrently accessing the DFS block cache. |
3333
| `core.dfs.deltaBaseCacheLimit` | `10 MiB` | ⃞ | Maximum number of bytes to hold in per-reader DFS delta base cache. |
34+
| `core.dfs.loadRevIndexInParallel` | false; | ⃞ | Try to load the reverse index in parallel with the bitmap index. |
3435
| `core.dfs.streamFileThreshold` | `50 MiB` | ⃞ | The size threshold beyond which objects must be streamed. |
3536
| `core.dfs.streamBuffer` | Block size of the pack | ⃞ | Number of bytes to use for buffering when streaming a pack file during copying. If 0 the block size of the pack is used|
3637
| `core.dfs.streamRatio` | `0.30` | ⃞ | Ratio of DFS block cache to occupy with a copied pack. Values between `0` and `1.0`. |

org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsReaderOptions.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_CORE_SECTION;
1414
import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_DFS_SECTION;
1515
import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_DELTA_BASE_CACHE_LIMIT;
16+
import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_LOAD_REV_INDEX_IN_PARALLEL;
1617
import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_STREAM_BUFFER;
1718
import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_STREAM_FILE_THRESHOLD;
1819
import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_USE_OBJECT_SIZE_INDEX;
@@ -197,6 +198,9 @@ public DfsReaderOptions fromConfig(Config rc) {
197198
setUseObjectSizeIndex(rc.getBoolean(CONFIG_CORE_SECTION,
198199
CONFIG_DFS_SECTION, CONFIG_KEY_USE_OBJECT_SIZE_INDEX,
199200
false));
201+
setLoadRevIndexInParallel(
202+
rc.getBoolean(CONFIG_CORE_SECTION, CONFIG_DFS_SECTION,
203+
CONFIG_KEY_LOAD_REV_INDEX_IN_PARALLEL, false));
200204
return this;
201205
}
202206
}

org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1027,4 +1027,11 @@ public final class ConfigConstants {
10271027
* @since 7.0
10281028
*/
10291029
public static final String CONFIG_KEY_USE_OBJECT_SIZE_INDEX = "useObjectSizeIndex";
1030+
1031+
/**
1032+
* The "loadRevIndexInParallel" key
1033+
*
1034+
* @since 7.1
1035+
*/
1036+
public static final String CONFIG_KEY_LOAD_REV_INDEX_IN_PARALLEL = "loadRevIndexInParallel";
10301037
}

0 commit comments

Comments
 (0)