Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
kvdb
rocksdb
提交
ebd85e8f
R
rocksdb
项目概览
kvdb
/
rocksdb
12 个月 前同步成功
通知
0
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
rocksdb
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
ebd85e8f
编写于
4月 18, 2014
作者:
A
Ankit Gupta
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix build
上级
dc291f5b
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
4 addition
and
19 deletion
+4
-19
Makefile
Makefile
+1
-5
java/Makefile
java/Makefile
+1
-5
java/org/rocksdb/Options.java
java/org/rocksdb/Options.java
+0
-6
java/rocksjni/portal.h
java/rocksjni/portal.h
+2
-3
未找到文件。
Makefile
浏览文件 @
ebd85e8f
...
...
@@ -422,12 +422,8 @@ ldb: tools/ldb.o $(LIBOBJECTS)
# ---------------------------------------------------------------------------
# Jni stuff
# ---------------------------------------------------------------------------
<<<<<<<
HEAD
JNI_NATIVE_SOURCES
=
./java/rocksjni/rocksjni.cc ./java/rocksjni/options.cc ./java/rocksjni/write_batch.cc ./java/rocksjni/statistics.cc
=======
JNI_NATIVE_SOURCES
=
./java/rocksjni/
*
.cc
>>>>>>>
1a8abe72768b2b5cea800aa390c28e5ace6a552e
JNI_NATIVE_SOURCES
=
./java/rocksjni/
*
.cc
JAVA_INCLUDE
=
-I
/usr/lib/jvm/java-openjdk/include/
-I
/usr/lib/jvm/java-openjdk/include/linux
ROCKSDBJNILIB
=
./java/librocksdbjni.so
...
...
java/Makefile
浏览文件 @
ebd85e8f
<<<<<<<
HEAD
NATIVE_JAVA_CLASSES
=
org.rocksdb.RocksDB org.rocksdb.Options org.rocksdb.WriteBatch org.rocksdb.WriteBatchInternal org.rocksdb.WriteBatchTest org.rocksdb.WriteOptions org.rocksdb.Statistics
=======
NATIVE_JAVA_CLASSES
=
org.rocksdb.RocksDB org.rocksdb.Options org.rocksdb.WriteBatch org.rocksdb.WriteBatchInternal org.rocksdb.WriteBatchTest org.rocksdb.WriteOptions org.rocksdb.BackupableDB org.rocksdb.BackupableDBOptions
>>>>>>>
1a8abe72768b2b5cea800aa390c28e5ace6a552e
NATIVE_JAVA_CLASSES
=
org.rocksdb.RocksDB org.rocksdb.Options org.rocksdb.WriteBatch org.rocksdb.WriteBatchInternal org.rocksdb.WriteBatchTest org.rocksdb.WriteOptions org.rocksdb.BackupableDB org.rocksdb.BackupableDBOptions org.rocksdb.Statistics
NATIVE_INCLUDE
=
./include
ROCKSDB_JAR
=
rocksdbjni.jar
...
...
java/org/rocksdb/Options.java
浏览文件 @
ebd85e8f
...
...
@@ -507,7 +507,6 @@ public class Options {
assert
(
isInitialized
());
return
maxBackgroundCompactions
(
nativeHandle_
);
}
private
native
int
maxBackgroundCompactions
(
long
handle
);
/*
* Creates statistics object which collects metrics about database operations.
...
...
@@ -561,8 +560,6 @@ public class Options {
setMaxBackgroundCompactions
(
nativeHandle_
,
maxBackgroundCompactions
);
return
this
;
}
private
native
void
setMaxBackgroundCompactions
(
long
handle
,
int
maxBackgroundCompactions
);
/**
* Returns the maximum number of concurrent background flush jobs.
...
...
@@ -1164,14 +1161,11 @@ public class Options {
private
native
void
setDisableSeekCompaction
(
long
handle
,
boolean
disableSeekCompaction
);
private
native
boolean
disableSeekCompaction
(
long
handle
);
<<<<<<<
HEAD
private
native
void
setMaxBackgroundCompactions
(
long
handle
,
int
maxBackgroundCompactions
);
private
native
int
maxBackgroundCompactions
(
long
handle
);
private
native
void
createStatistics
(
long
optHandle
);
private
native
long
statisticsPtr
(
long
optHandle
);
=======
>>>>>>>
1
a8abe72768b2b5cea800aa390c28e5ace6a552e
long
nativeHandle_
;
long
cacheSize_
;
...
...
java/rocksjni/portal.h
浏览文件 @
ebd85e8f
...
...
@@ -172,7 +172,6 @@ class WriteBatchJni {
}
};
<<<<<<<
HEAD
class
HistogramDataJni
{
public:
static
jmethodID
getConstructorMethodId
(
JNIEnv
*
env
,
jclass
jclazz
)
{
...
...
@@ -180,7 +179,8 @@ class HistogramDataJni {
jclazz
,
"<init>"
,
"(DDDDD)V"
);
assert
(
mid
!=
nullptr
);
return
mid
;
=======
}
};
class
BackupableDBOptionsJni
{
public:
// Get the java class id of org.rocksdb.BackupableDBOptions.
...
...
@@ -211,7 +211,6 @@ class BackupableDBOptionsJni {
env
->
SetLongField
(
jobj
,
getHandleFieldID
(
env
),
reinterpret_cast
<
jlong
>
(
op
));
>>>>>>>
1
a8abe72768b2b5cea800aa390c28e5ace6a552e
}
};
}
// namespace rocksdb
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录