• R/O
  • SSH
  • HTTPS

senna-java: Commit


Commit MetaInfo

Revision6 (tree)
Time2008-12-18 17:04:08
Authormir

Log Message

* build.xml: add DB API classes for javah
* src/jni/senna_SennaContext.h: appeared
* src/jni/senna_Cursor: appeared
* src/jni/senna_Type.h: appeared
* src/jni/senna_Table.h: appeared
* src/jni/senna_SennaObject.h: appeared
* src/jni/senna_Space.h: appeared
* src/jni/senna_Column.h: appeared
* src/jni/senna_Senna.h: add sen_ctx flags

Change Summary

Incremental Difference

--- trunk/build.xml (revision 5)
+++ trunk/build.xml (revision 6)
@@ -46,6 +46,27 @@
4646 <javah classpath="${build.dest}"
4747 class="senna.Snippet"
4848 outputfile="${jni.source}/senna_Snippet.h" />
49+ <javah classpath="${build.dest}"
50+ class="senna.SennaContext"
51+ outputfile="${jni.source}/senna_SennaContext.h" />
52+ <javah classpath="${build.dest}"
53+ class="senna.SennaObject"
54+ outputfile="${jni.source}/senna_SennaObject.h" />
55+ <javah classpath="${build.dest}"
56+ class="senna.Space"
57+ outputfile="${jni.source}/senna_Space.h" />
58+ <javah classpath="${build.dest}"
59+ class="senna.Table"
60+ outputfile="${jni.source}/senna_Table.h" />
61+ <javah classpath="${build.dest}"
62+ class="senna.Column"
63+ outputfile="${jni.source}/senna_Column.h" />
64+ <javah classpath="${build.dest}"
65+ class="senna.Type"
66+ outputfile="${jni.source}/senna_Type.h" />
67+ <javah classpath="${build.dest}"
68+ class="senna.Cursor"
69+ outputfile="${jni.source}/senna_Cursor.h" />
4970 </target>
5071 <target name="jni" depends="jar">
5172 <exec dir="${jni.source}" executable="make" />
@@ -67,6 +88,7 @@
6788 fork="true">
6889 <jvmarg value="-Djava.library.path=." />
6990 <classpath>
91+ <pathelement location="lib/junit.jar" />
7092 <pathelement location="${test.dest}" />
7193 <pathelement location="${build.dest}" />
7294 </classpath>
--- trunk/ChangeLog (revision 5)
+++ trunk/ChangeLog (revision 6)
@@ -1,4 +1,15 @@
11 2008-12-18 Tetsuro IKEDA <ikdttr@gmail.com>
2+ * build.xml: add DB API classes for javah
3+ * src/jni/senna_SennaContext.h: appeared
4+ * src/jni/senna_Cursor: appeared
5+ * src/jni/senna_Type.h: appeared
6+ * src/jni/senna_Table.h: appeared
7+ * src/jni/senna_SennaObject.h: appeared
8+ * src/jni/senna_Space.h: appeared
9+ * src/jni/senna_Column.h: appeared
10+ * src/jni/senna_Senna.h: add sen_ctx flags
11+
12+2008-12-18 Tetsuro IKEDA <ikdttr@gmail.com>
213 * src/java/senna/Senna.java: added sen_ctx flags.
314 * imported new classes for Senna DB API - based on rev1277.
415
--- trunk/src/jni/senna_SennaContext.h (revision 0)
+++ trunk/src/jni/senna_SennaContext.h (revision 6)
@@ -0,0 +1,61 @@
1+/* DO NOT EDIT THIS FILE - it is machine generated */
2+#include <jni.h>
3+/* Header for class senna_SennaContext */
4+
5+#ifndef _Included_senna_SennaContext
6+#define _Included_senna_SennaContext
7+#ifdef __cplusplus
8+extern "C" {
9+#endif
10+/*
11+ * Class: senna_SennaContext
12+ * Method: init
13+ * Signature: (II)V
14+ */
15+JNIEXPORT void JNICALL Java_senna_SennaContext_init
16+ (JNIEnv *, jobject, jint, jint);
17+
18+/*
19+ * Class: senna_SennaContext
20+ * Method: fin
21+ * Signature: ()V
22+ */
23+JNIEXPORT void JNICALL Java_senna_SennaContext_fin
24+ (JNIEnv *, jobject);
25+
26+/*
27+ * Class: senna_SennaContext
28+ * Method: use
29+ * Signature: (Lsenna/Space;)V
30+ */
31+JNIEXPORT void JNICALL Java_senna_SennaContext_use
32+ (JNIEnv *, jobject, jobject);
33+
34+/*
35+ * Class: senna_SennaContext
36+ * Method: getSpace
37+ * Signature: ()Lsenna/Space;
38+ */
39+JNIEXPORT jobject JNICALL Java_senna_SennaContext_getSpace
40+ (JNIEnv *, jobject);
41+
42+/*
43+ * Class: senna_SennaContext
44+ * Method: lookup
45+ * Signature: (Ljava/lang/String;)Lsenna/SennaObject;
46+ */
47+JNIEXPORT jobject JNICALL Java_senna_SennaContext_lookup
48+ (JNIEnv *, jobject, jstring);
49+
50+/*
51+ * Class: senna_SennaContext
52+ * Method: get
53+ * Signature: (I)Lsenna/SennaObject;
54+ */
55+JNIEXPORT jobject JNICALL Java_senna_SennaContext_get
56+ (JNIEnv *, jobject, jint);
57+
58+#ifdef __cplusplus
59+}
60+#endif
61+#endif
--- trunk/src/jni/senna_Cursor.h (revision 0)
+++ trunk/src/jni/senna_Cursor.h (revision 6)
@@ -0,0 +1,69 @@
1+/* DO NOT EDIT THIS FILE - it is machine generated */
2+#include <jni.h>
3+/* Header for class senna_Cursor */
4+
5+#ifndef _Included_senna_Cursor
6+#define _Included_senna_Cursor
7+#ifdef __cplusplus
8+extern "C" {
9+#endif
10+/*
11+ * Class: senna_Cursor
12+ * Method: open
13+ * Signature: (Lsenna/Table;Ljava/lang/String;Ljava/lang/String;)Lsenna/Cursor;
14+ */
15+JNIEXPORT jobject JNICALL Java_senna_Cursor_open
16+ (JNIEnv *, jobject, jobject, jstring, jstring);
17+
18+/*
19+ * Class: senna_Cursor
20+ * Method: close
21+ * Signature: ()V
22+ */
23+JNIEXPORT void JNICALL Java_senna_Cursor_close
24+ (JNIEnv *, jobject);
25+
26+/*
27+ * Class: senna_Cursor
28+ * Method: next
29+ * Signature: ()I
30+ */
31+JNIEXPORT jint JNICALL Java_senna_Cursor_next
32+ (JNIEnv *, jobject);
33+
34+/*
35+ * Class: senna_Cursor
36+ * Method: getKey
37+ * Signature: ()Ljava/lang/String;
38+ */
39+JNIEXPORT jstring JNICALL Java_senna_Cursor_getKey
40+ (JNIEnv *, jobject);
41+
42+/*
43+ * Class: senna_Cursor
44+ * Method: getValue
45+ * Signature: ()Ljava/lang/String;
46+ */
47+JNIEXPORT jstring JNICALL Java_senna_Cursor_getValue
48+ (JNIEnv *, jobject);
49+
50+/*
51+ * Class: senna_Cursor
52+ * Method: setValue
53+ * Signature: (Ljava/lang/String;I)V
54+ */
55+JNIEXPORT void JNICALL Java_senna_Cursor_setValue
56+ (JNIEnv *, jobject, jstring, jint);
57+
58+/*
59+ * Class: senna_Cursor
60+ * Method: delete
61+ * Signature: ()V
62+ */
63+JNIEXPORT void JNICALL Java_senna_Cursor_delete
64+ (JNIEnv *, jobject);
65+
66+#ifdef __cplusplus
67+}
68+#endif
69+#endif
--- trunk/src/jni/senna_Type.h (revision 0)
+++ trunk/src/jni/senna_Type.h (revision 6)
@@ -0,0 +1,21 @@
1+/* DO NOT EDIT THIS FILE - it is machine generated */
2+#include <jni.h>
3+/* Header for class senna_Type */
4+
5+#ifndef _Included_senna_Type
6+#define _Included_senna_Type
7+#ifdef __cplusplus
8+extern "C" {
9+#endif
10+/*
11+ * Class: senna_Type
12+ * Method: create
13+ * Signature: (Lsenna/SennaContext;Ljava/lang/String;II)Lsenna/Type;
14+ */
15+JNIEXPORT jobject JNICALL Java_senna_Type_create
16+ (JNIEnv *, jclass, jobject, jstring, jint, jint);
17+
18+#ifdef __cplusplus
19+}
20+#endif
21+#endif
--- trunk/src/jni/senna_Table.h (revision 0)
+++ trunk/src/jni/senna_Table.h (revision 6)
@@ -0,0 +1,125 @@
1+/* DO NOT EDIT THIS FILE - it is machine generated */
2+#include <jni.h>
3+/* Header for class senna_Table */
4+
5+#ifndef _Included_senna_Table
6+#define _Included_senna_Table
7+#ifdef __cplusplus
8+extern "C" {
9+#endif
10+/*
11+ * Class: senna_Table
12+ * Method: create
13+ * Signature: (Lsenna/SennaContext;Ljava/lang/String;Ljava/lang/String;ILsenna/Type;I)Lsenna/Type;
14+ */
15+JNIEXPORT jobject JNICALL Java_senna_Table_create
16+ (JNIEnv *, jclass, jobject, jstring, jstring, jint, jobject, jint);
17+
18+/*
19+ * Class: senna_Table
20+ * Method: open
21+ * Signature: (Lsenna/SennaContext;Ljava/lang/String;Ljava/lang/String;)Lsenna/Table;
22+ */
23+JNIEXPORT jobject JNICALL Java_senna_Table_open
24+ (JNIEnv *, jobject, jobject, jstring, jstring);
25+
26+/*
27+ * Class: senna_Table
28+ * Method: lookup
29+ * Signature: (Ljava/lang/String;I)I
30+ */
31+JNIEXPORT jint JNICALL Java_senna_Table_lookup
32+ (JNIEnv *, jobject, jstring, jint);
33+
34+/*
35+ * Class: senna_Table
36+ * Method: add
37+ * Signature: ()I
38+ */
39+JNIEXPORT jint JNICALL Java_senna_Table_add
40+ (JNIEnv *, jobject);
41+
42+/*
43+ * Class: senna_Table
44+ * Method: getKey
45+ * Signature: (I)Ljava/lang/String;
46+ */
47+JNIEXPORT jstring JNICALL Java_senna_Table_getKey
48+ (JNIEnv *, jobject, jint);
49+
50+/*
51+ * Class: senna_Table
52+ * Method: delete
53+ * Signature: (Ljava/lang/String;)V
54+ */
55+JNIEXPORT void JNICALL Java_senna_Table_delete
56+ (JNIEnv *, jobject, jstring);
57+
58+/*
59+ * Class: senna_Table
60+ * Method: deleteByID
61+ * Signature: (I)V
62+ */
63+JNIEXPORT void JNICALL Java_senna_Table_deleteByID
64+ (JNIEnv *, jobject, jint);
65+
66+/*
67+ * Class: senna_Table
68+ * Method: truncate
69+ * Signature: ()V
70+ */
71+JNIEXPORT void JNICALL Java_senna_Table_truncate
72+ (JNIEnv *, jobject);
73+
74+/*
75+ * Class: senna_Table
76+ * Method: sort
77+ * Signature: (II)Lsenna/Table;
78+ */
79+JNIEXPORT jobject JNICALL Java_senna_Table_sort
80+ (JNIEnv *, jobject, jint, jint);
81+
82+/*
83+ * Class: senna_Table
84+ * Method: group
85+ * Signature: ([Ljava/lang/String;)Lsenna/Table;
86+ */
87+JNIEXPORT jobject JNICALL Java_senna_Table_group
88+ (JNIEnv *, jobject, jobjectArray);
89+
90+/*
91+ * Class: senna_Table
92+ * Method: setoperation
93+ * Signature: (Lsenna/Table;I)Lsenna/Table;
94+ */
95+JNIEXPORT jobject JNICALL Java_senna_Table_setoperation
96+ (JNIEnv *, jobject, jobject, jint);
97+
98+/*
99+ * Class: senna_Table
100+ * Method: difference
101+ * Signature: (Lsenna/Table;)[Lsenna/Table;
102+ */
103+JNIEXPORT jobjectArray JNICALL Java_senna_Table_difference
104+ (JNIEnv *, jobject, jobject);
105+
106+/*
107+ * Class: senna_Table
108+ * Method: getColumn
109+ * Signature: (Ljava/lang/String;)Lsenna/Column;
110+ */
111+JNIEXPORT jobject JNICALL Java_senna_Table_getColumn
112+ (JNIEnv *, jobject, jstring);
113+
114+/*
115+ * Class: senna_Table
116+ * Method: size
117+ * Signature: ()I
118+ */
119+JNIEXPORT jint JNICALL Java_senna_Table_size
120+ (JNIEnv *, jobject);
121+
122+#ifdef __cplusplus
123+}
124+#endif
125+#endif
--- trunk/src/jni/senna_SennaObject.h (revision 0)
+++ trunk/src/jni/senna_SennaObject.h (revision 6)
@@ -0,0 +1,109 @@
1+/* DO NOT EDIT THIS FILE - it is machine generated */
2+#include <jni.h>
3+/* Header for class senna_SennaObject */
4+
5+#ifndef _Included_senna_SennaObject
6+#define _Included_senna_SennaObject
7+#ifdef __cplusplus
8+extern "C" {
9+#endif
10+/*
11+ * Class: senna_SennaObject
12+ * Method: remove
13+ * Signature: (Ljava/lang/String;)V
14+ */
15+JNIEXPORT void JNICALL Java_senna_SennaObject_remove
16+ (JNIEnv *, jobject, jstring);
17+
18+/*
19+ * Class: senna_SennaObject
20+ * Method: rename
21+ * Signature: (Ljava/lang/String;Ljava/lang/String;)V
22+ */
23+JNIEXPORT void JNICALL Java_senna_SennaObject_rename
24+ (JNIEnv *, jobject, jstring, jstring);
25+
26+/*
27+ * Class: senna_SennaObject
28+ * Method: close
29+ * Signature: ()V
30+ */
31+JNIEXPORT void JNICALL Java_senna_SennaObject_close
32+ (JNIEnv *, jobject);
33+
34+/*
35+ * Class: senna_SennaObject
36+ * Method: getPath
37+ * Signature: ()Ljava/lang/String;
38+ */
39+JNIEXPORT jstring JNICALL Java_senna_SennaObject_getPath
40+ (JNIEnv *, jobject);
41+
42+/*
43+ * Class: senna_SennaObject
44+ * Method: getName
45+ * Signature: ()Ljava/lang/String;
46+ */
47+JNIEXPORT jstring JNICALL Java_senna_SennaObject_getName
48+ (JNIEnv *, jobject);
49+
50+/*
51+ * Class: senna_SennaObject
52+ * Method: expire
53+ * Signature: (I)V
54+ */
55+JNIEXPORT void JNICALL Java_senna_SennaObject_expire
56+ (JNIEnv *, jobject, jint);
57+
58+/*
59+ * Class: senna_SennaObject
60+ * Method: check
61+ * Signature: ()I
62+ */
63+JNIEXPORT jint JNICALL Java_senna_SennaObject_check
64+ (JNIEnv *, jobject);
65+
66+/*
67+ * Class: senna_SennaObject
68+ * Method: lock
69+ * Signature: (I)V
70+ */
71+JNIEXPORT void JNICALL Java_senna_SennaObject_lock
72+ (JNIEnv *, jobject, jint);
73+
74+/*
75+ * Class: senna_SennaObject
76+ * Method: unlock
77+ * Signature: ()V
78+ */
79+JNIEXPORT void JNICALL Java_senna_SennaObject_unlock
80+ (JNIEnv *, jobject);
81+
82+/*
83+ * Class: senna_SennaObject
84+ * Method: clearLock
85+ * Signature: ()V
86+ */
87+JNIEXPORT void JNICALL Java_senna_SennaObject_clearLock
88+ (JNIEnv *, jobject);
89+
90+/*
91+ * Class: senna_SennaObject
92+ * Method: isLocked
93+ * Signature: ()Z
94+ */
95+JNIEXPORT jboolean JNICALL Java_senna_SennaObject_isLocked
96+ (JNIEnv *, jobject);
97+
98+/*
99+ * Class: senna_SennaObject
100+ * Method: getSpace
101+ * Signature: ()Lsenna/Space;
102+ */
103+JNIEXPORT jobject JNICALL Java_senna_SennaObject_getSpace
104+ (JNIEnv *, jobject);
105+
106+#ifdef __cplusplus
107+}
108+#endif
109+#endif
--- trunk/src/jni/senna_Space.h (revision 0)
+++ trunk/src/jni/senna_Space.h (revision 6)
@@ -0,0 +1,37 @@
1+/* DO NOT EDIT THIS FILE - it is machine generated */
2+#include <jni.h>
3+/* Header for class senna_Space */
4+
5+#ifndef _Included_senna_Space
6+#define _Included_senna_Space
7+#ifdef __cplusplus
8+extern "C" {
9+#endif
10+/*
11+ * Class: senna_Space
12+ * Method: create
13+ * Signature: (Lsenna/SennaContext;Ljava/lang/String;)Lsenna/Space;
14+ */
15+JNIEXPORT jobject JNICALL Java_senna_Space_create__Lsenna_SennaContext_2Ljava_lang_String_2
16+ (JNIEnv *, jclass, jobject, jstring);
17+
18+/*
19+ * Class: senna_Space
20+ * Method: create
21+ * Signature: (Lsenna/SennaContext;Ljava/lang/String;I)Lsenna/Space;
22+ */
23+JNIEXPORT jobject JNICALL Java_senna_Space_create__Lsenna_SennaContext_2Ljava_lang_String_2I
24+ (JNIEnv *, jclass, jobject, jstring, jint);
25+
26+/*
27+ * Class: senna_Space
28+ * Method: open
29+ * Signature: (Lsenna/SennaContext;Ljava/lang/String;I)Lsenna/Space;
30+ */
31+JNIEXPORT jobject JNICALL Java_senna_Space_open
32+ (JNIEnv *, jobject, jobject, jstring, jint);
33+
34+#ifdef __cplusplus
35+}
36+#endif
37+#endif
--- trunk/src/jni/senna_Column.h (revision 0)
+++ trunk/src/jni/senna_Column.h (revision 6)
@@ -0,0 +1,45 @@
1+/* DO NOT EDIT THIS FILE - it is machine generated */
2+#include <jni.h>
3+/* Header for class senna_Column */
4+
5+#ifndef _Included_senna_Column
6+#define _Included_senna_Column
7+#ifdef __cplusplus
8+extern "C" {
9+#endif
10+/*
11+ * Class: senna_Column
12+ * Method: create
13+ * Signature: (Lsenna/SennaContext;Lsenna/Table;Ljava/lang/String;Ljava/lang/String;I)Lsenna/Column;
14+ */
15+JNIEXPORT jobject JNICALL Java_senna_Column_create
16+ (JNIEnv *, jclass, jobject, jobject, jstring, jstring, jint);
17+
18+/*
19+ * Class: senna_Column
20+ * Method: open
21+ * Signature: (Lsenna/SennaContext;Lsenna/Table;Ljava/lang/String;Ljava/lang/String;Lsenna/Type;)Lsenna/Column;
22+ */
23+JNIEXPORT jobject JNICALL Java_senna_Column_open
24+ (JNIEnv *, jobject, jobject, jobject, jstring, jstring, jobject);
25+
26+/*
27+ * Class: senna_Column
28+ * Method: indexUpdate
29+ * Signature: (IILjava/lang/String;Ljava/lang/String;)V
30+ */
31+JNIEXPORT void JNICALL Java_senna_Column_indexUpdate
32+ (JNIEnv *, jobject, jint, jint, jstring, jstring);
33+
34+/*
35+ * Class: senna_Column
36+ * Method: getTable
37+ * Signature: ()Lsenna/Table;
38+ */
39+JNIEXPORT jobject JNICALL Java_senna_Column_getTable
40+ (JNIEnv *, jobject);
41+
42+#ifdef __cplusplus
43+}
44+#endif
45+#endif
--- trunk/src/jni/senna_Senna.h (revision 5)
+++ trunk/src/jni/senna_Senna.h (revision 6)
@@ -45,6 +45,14 @@
4545 #define senna_Senna_SEN_ENC_KOI8R 6L
4646 #undef senna_Senna_SEN_SNIP_NORMALIZE
4747 #define senna_Senna_SEN_SNIP_NORMALIZE 1L
48+#undef senna_Senna_SEN_CTX_NO_DB
49+#define senna_Senna_SEN_CTX_NO_DB 0L
50+#undef senna_Senna_SEN_CTX_USE_DB
51+#define senna_Senna_SEN_CTX_USE_DB 1L
52+#undef senna_Senna_SEN_CTX_USE_QL
53+#define senna_Senna_SEN_CTX_USE_QL 3L
54+#undef senna_Senna_SEN_CTX_BATCH_MODE
55+#define senna_Senna_SEN_CTX_BATCH_MODE 4L
4856 /*
4957 * Class: senna_Senna
5058 * Method: init
Show on old repository browser