Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
kvdb
rocksdb
提交
23ad5f40
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,发现更多精彩内容 >>
提交
23ad5f40
编写于
1月 10, 2015
作者:
F
fyrz
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[RocksJava] Incorporated changes for D30525
上级
0aab1005
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
10 addition
and
8 deletion
+10
-8
java/org/rocksdb/ColumnFamilyDescriptor.java
java/org/rocksdb/ColumnFamilyDescriptor.java
+4
-2
java/rocksjni/rocksjni.cc
java/rocksjni/rocksjni.cc
+6
-6
未找到文件。
java/org/rocksdb/ColumnFamilyDescriptor.java
浏览文件 @
23ad5f40
...
@@ -16,7 +16,8 @@ public class ColumnFamilyDescriptor {
...
@@ -16,7 +16,8 @@ public class ColumnFamilyDescriptor {
* options,</p>
* options,</p>
*
*
* @param columnFamilyName name of column family.
* @param columnFamilyName name of column family.
* @deprecated will be removed in RocksDB 3.10.0. Use {}
* @deprecated will be removed in RocksDB 3.10.0. Use
* {@link #ColumnFamilyDescriptor(byte[])} instead.
*/
*/
@Deprecated
@Deprecated
public
ColumnFamilyDescriptor
(
final
String
columnFamilyName
){
public
ColumnFamilyDescriptor
(
final
String
columnFamilyName
){
...
@@ -41,7 +42,8 @@ public class ColumnFamilyDescriptor {
...
@@ -41,7 +42,8 @@ public class ColumnFamilyDescriptor {
* @param columnFamilyName name of column family.
* @param columnFamilyName name of column family.
* @param columnFamilyOptions options to be used with
* @param columnFamilyOptions options to be used with
* column family.
* column family.
* @deprecated will be removed in RocksDB 3.10.0. Use {}
* @deprecated will be removed in RocksDB 3.10.0. Use
* {@link #ColumnFamilyDescriptor(byte[], ColumnFamilyOptions)} instead.
*/
*/
@Deprecated
@Deprecated
public
ColumnFamilyDescriptor
(
final
String
columnFamilyName
,
public
ColumnFamilyDescriptor
(
final
String
columnFamilyName
,
...
...
java/rocksjni/rocksjni.cc
浏览文件 @
23ad5f40
...
@@ -93,11 +93,11 @@ jobject
...
@@ -93,11 +93,11 @@ jobject
jbyteArray
byteArray
=
static_cast
<
jbyteArray
>
(
env
->
CallObjectMethod
(
jbyteArray
byteArray
=
static_cast
<
jbyteArray
>
(
env
->
CallObjectMethod
(
jcf_descriptor
,
jcf_descriptor
,
rocksdb
::
ColumnFamilyDescriptorJni
::
getColumnFamilyNameMethod
(
rocksdb
::
ColumnFamilyDescriptorJni
::
getColumnFamilyNameMethod
(
env
)));
env
)));
// get CF Options
// get CF Options
jobject
jcf_opt_obj
=
env
->
CallObjectMethod
(
jcf_descriptor
,
jobject
jcf_opt_obj
=
env
->
CallObjectMethod
(
jcf_descriptor
,
rocksdb
::
ColumnFamilyDescriptorJni
::
getColumnFamilyOptionsMethod
(
rocksdb
::
ColumnFamilyDescriptorJni
::
getColumnFamilyOptionsMethod
(
env
));
env
));
rocksdb
::
ColumnFamilyOptions
*
cfOptions
=
rocksdb
::
ColumnFamilyOptions
*
cfOptions
=
rocksdb
::
ColumnFamilyOptionsJni
::
getHandle
(
env
,
jcf_opt_obj
);
rocksdb
::
ColumnFamilyOptionsJni
::
getHandle
(
env
,
jcf_opt_obj
);
...
@@ -178,11 +178,11 @@ jobject Java_org_rocksdb_RocksDB_open__JLjava_lang_String_2Ljava_util_List_2I(
...
@@ -178,11 +178,11 @@ jobject Java_org_rocksdb_RocksDB_open__JLjava_lang_String_2Ljava_util_List_2I(
jbyteArray
byteArray
=
static_cast
<
jbyteArray
>
(
env
->
CallObjectMethod
(
jbyteArray
byteArray
=
static_cast
<
jbyteArray
>
(
env
->
CallObjectMethod
(
jcf_descriptor
,
jcf_descriptor
,
rocksdb
::
ColumnFamilyDescriptorJni
::
getColumnFamilyNameMethod
(
rocksdb
::
ColumnFamilyDescriptorJni
::
getColumnFamilyNameMethod
(
env
)));
env
)));
// get CF Options
// get CF Options
jobject
jcf_opt_obj
=
env
->
CallObjectMethod
(
jcf_descriptor
,
jobject
jcf_opt_obj
=
env
->
CallObjectMethod
(
jcf_descriptor
,
rocksdb
::
ColumnFamilyDescriptorJni
::
getColumnFamilyOptionsMethod
(
rocksdb
::
ColumnFamilyDescriptorJni
::
getColumnFamilyOptionsMethod
(
env
));
env
));
rocksdb
::
ColumnFamilyOptions
*
cfOptions
=
rocksdb
::
ColumnFamilyOptions
*
cfOptions
=
rocksdb
::
ColumnFamilyOptionsJni
::
getHandle
(
env
,
jcf_opt_obj
);
rocksdb
::
ColumnFamilyOptionsJni
::
getHandle
(
env
,
jcf_opt_obj
);
...
@@ -1189,11 +1189,11 @@ jlong Java_org_rocksdb_RocksDB_createColumnFamily(
...
@@ -1189,11 +1189,11 @@ jlong Java_org_rocksdb_RocksDB_createColumnFamily(
jbyteArray
byteArray
=
static_cast
<
jbyteArray
>
(
env
->
CallObjectMethod
(
jbyteArray
byteArray
=
static_cast
<
jbyteArray
>
(
env
->
CallObjectMethod
(
jcf_descriptor
,
jcf_descriptor
,
rocksdb
::
ColumnFamilyDescriptorJni
::
getColumnFamilyNameMethod
(
rocksdb
::
ColumnFamilyDescriptorJni
::
getColumnFamilyNameMethod
(
env
)));
env
)));
// get CF Options
// get CF Options
jobject
jcf_opt_obj
=
env
->
CallObjectMethod
(
jcf_descriptor
,
jobject
jcf_opt_obj
=
env
->
CallObjectMethod
(
jcf_descriptor
,
rocksdb
::
ColumnFamilyDescriptorJni
::
getColumnFamilyOptionsMethod
(
rocksdb
::
ColumnFamilyDescriptorJni
::
getColumnFamilyOptionsMethod
(
env
));
env
));
rocksdb
::
ColumnFamilyOptions
*
cfOptions
=
rocksdb
::
ColumnFamilyOptions
*
cfOptions
=
rocksdb
::
ColumnFamilyOptionsJni
::
getHandle
(
env
,
jcf_opt_obj
);
rocksdb
::
ColumnFamilyOptionsJni
::
getHandle
(
env
,
jcf_opt_obj
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录