Skip to content

Commit ca7403c

Browse files
authored
Merge pull request #35 from scalableminds/column-options-long
Fix Integer Overflow in Default Column Config
2 parents fe8a923 + 53a6ebf commit ca7403c

File tree

2 files changed

+9
-11
lines changed

2 files changed

+9
-11
lines changed

.circleci/config.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ version: 2
22
jobs:
33
build_and_push:
44
machine:
5-
image: circleci/classic:latest
5+
image: ubuntu-2004:202111-02
66
environment:
77
SBT_VERSION_TAG: sbt-0.13.15_mongo-3.2.17_node-8.x_jdk-8
8-
USER_UID: 1001
9-
USER_GID: 1001
8+
USER_UID: 1000
9+
USER_GID: 1000
1010
TARGET_DIR: target/scala-2.12
1111
steps:
1212
- checkout
@@ -18,7 +18,7 @@ jobs:
1818
key: cache-{{ .Branch }}
1919
- run:
2020
name: Build server
21-
command: docker-compose run -e CI=$CI sbt sbt assembly
21+
command: docker-compose run -T -e CI=$CI sbt sbt assembly
2222
- run:
2323
name: Get FossilDB version
2424
command: docker-compose run sbt java -jar $TARGET_DIR/fossildb.jar --version > $TARGET_DIR/version

src/main/scala/com/scalableminds/fossildb/db/RocksDBStore.scala

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,11 @@
33
*/
44
package com.scalableminds.fossildb.db
55

6-
import java.io.File
7-
import java.nio.file.{Files, Path, Paths}
8-
import java.util
9-
106
import com.typesafe.scalalogging.LazyLogging
117
import org.rocksdb._
128

9+
import java.nio.file.{Files, Path}
10+
import java.util
1311
import scala.collection.JavaConverters._
1412
import scala.collection.mutable
1513
import scala.concurrent.Future
@@ -23,9 +21,9 @@ class RocksDBManager(dataDir: Path, columnFamilies: List[String], optionsFilePat
2321
val (db: RocksDB, columnFamilyHandles) = {
2422
RocksDB.loadLibrary()
2523
val columnOptions = new ColumnFamilyOptions()
26-
.setArenaBlockSize(4 * 1024 * 1024) // 4MB
27-
.setTargetFileSizeBase(1024 * 1024 * 1024) // 1GB
28-
.setMaxBytesForLevelBase(10 * 1024 * 1024 * 1024) // 10GB
24+
.setArenaBlockSize(4L * 1024 * 1024) // 4MB
25+
.setTargetFileSizeBase(1024L * 1024 * 1024) // 1GB
26+
.setMaxBytesForLevelBase(10L * 1024 * 1024 * 1024) // 10GB
2927
val options = new DBOptions()
3028
val cfListRef: mutable.Buffer[ColumnFamilyDescriptor] = mutable.Buffer()
3129
optionsFilePathOpt.foreach { optionsFilePath =>

0 commit comments

Comments
 (0)