database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-07-29 08:01:23 +03:00
Code Activity

Minor java cleanups recommended by a modern IDE.

Browse Source 
FossilOrigin-Name: f92a9bbabebc33a771835e259b04a57d07add1eacf3d9aec5fddf929ce8a3022
This commit is contained in:
stephan
2023-07-28 10:37:17 +00:00
parent 069029011e
commit c7f602497b
4 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ext/jni/src/org/sqlite/jni/SQLite3Jni.java
View File

@ -200,7 +200,7 @@ public final class SQLite3Jni {
int ndx, int ndx,
@NotNull Class<T> type){ @NotNull Class<T> type){
final Object o = sqlite3_column_java_object(stmt, ndx); final Object o = sqlite3_column_java_object(stmt, ndx);
return (null!=o && type.isInstance(o)) ? (T)o : null; return type.isInstance(o) ? (T)o : null;
} }
public static native String sqlite3_column_origin_name(@NotNull sqlite3_stmt stmt, int ndx); public static native String sqlite3_column_origin_name(@NotNull sqlite3_stmt stmt, int ndx);
@ -700,7 +700,7 @@ public final class SQLite3Jni {
public static <T> T sqlite3_value_java_casted(@NotNull sqlite3_value v, public static <T> T sqlite3_value_java_casted(@NotNull sqlite3_value v,
@NotNull Class<T> type){ @NotNull Class<T> type){
final Object o = sqlite3_value_java_object(v); final Object o = sqlite3_value_java_object(v);
return (null!=o && type.isInstance(o)) ? (T)o : null; return type.isInstance(o) ? (T)o : null;
} }
/** /**

26
ext/jni/src/org/sqlite/jni/Tester1.java
View File

@ -202,7 +202,7 @@ public class Tester1 {
rowid = x; rowid = x;
} }
sqlite3_finalize(stmt); sqlite3_finalize(stmt);
affirm(total1 > 0); affirm(300 == total1);
affirm(sqlite3_changes(db) > changes); affirm(sqlite3_changes(db) > changes);
affirm(sqlite3_total_changes(db) > changesT); affirm(sqlite3_total_changes(db) > changesT);
affirm(sqlite3_changes64(db) > changes64); affirm(sqlite3_changes64(db) > changes64);
@ -279,7 +279,7 @@ public class Tester1 {
execSql(db, "CREATE TABLE t(a)"); execSql(db, "CREATE TABLE t(a)");
sqlite3_stmt stmt = new sqlite3_stmt(); sqlite3_stmt stmt = new sqlite3_stmt();
int rc = sqlite3_prepare(db, "INSERT INTO t(a) VALUES(?);", stmt); int rc = sqlite3_prepare(db, "INSERT INTO t(a) VALUES(?);", stmt);
String list1[] = { "hell🤩", "w😃rld", "!" }; String[] list1 = { "hell🤩", "w😃rld", "!" };
for( String e : list1 ){ for( String e : list1 ){
rc = sqlite3_bind_text(stmt, 1, e); rc = sqlite3_bind_text(stmt, 1, e);
affirm(0 == rc); affirm(0 == rc);
@ -290,7 +290,7 @@ public class Tester1 {
sqlite3_finalize(stmt); sqlite3_finalize(stmt);
rc = sqlite3_prepare(db, "SELECT a FROM t ORDER BY a DESC;", stmt); rc = sqlite3_prepare(db, "SELECT a FROM t ORDER BY a DESC;", stmt);
affirm(0 == rc); affirm(0 == rc);
StringBuffer sbuf = new StringBuffer(); StringBuilder sbuf = new StringBuilder();
int n = 0; int n = 0;
while( SQLITE_ROW == sqlite3_step(stmt) ){ while( SQLITE_ROW == sqlite3_step(stmt) ){
String txt = sqlite3_column_text(stmt, 0); String txt = sqlite3_column_text(stmt, 0);
@ -309,7 +309,7 @@ public class Tester1 {
execSql(db, "CREATE TABLE t(a)"); execSql(db, "CREATE TABLE t(a)");
sqlite3_stmt stmt = new sqlite3_stmt(); sqlite3_stmt stmt = new sqlite3_stmt();
int rc = sqlite3_prepare(db, "INSERT INTO t(a) VALUES(?);", stmt); int rc = sqlite3_prepare(db, "INSERT INTO t(a) VALUES(?);", stmt);
byte list1[] = { 0x32, 0x33, 0x34 }; byte[] list1 = { 0x32, 0x33, 0x34 };
rc = sqlite3_bind_blob(stmt, 1, list1); rc = sqlite3_bind_blob(stmt, 1, list1);
rc = sqlite3_step(stmt); rc = sqlite3_step(stmt);
affirm(SQLITE_DONE == rc); affirm(SQLITE_DONE == rc);
@ -319,7 +319,7 @@ public class Tester1 {
int n = 0; int n = 0;
int total = 0; int total = 0;
while( SQLITE_ROW == sqlite3_step(stmt) ){ while( SQLITE_ROW == sqlite3_step(stmt) ){
byte blob[] = sqlite3_column_blob(stmt, 0); byte[] blob = sqlite3_column_blob(stmt, 0);
affirm(3 == blob.length); affirm(3 == blob.length);
int i = 0; int i = 0;
for(byte b : blob){ for(byte b : blob){
@ -427,7 +427,7 @@ public class Tester1 {
// result is possibly somewhat noisy for those not at home in // result is possibly somewhat noisy for those not at home in
// Java... // Java...
new SQLFunction.Scalar(){ new SQLFunction.Scalar(){
public void xFunc(sqlite3_context cx, sqlite3_value args[]){ public void xFunc(sqlite3_context cx, sqlite3_value[] args){
affirm(db.getNativePointer() affirm(db.getNativePointer()
== sqlite3_context_db_handle(cx).getNativePointer()); == sqlite3_context_db_handle(cx).getNativePointer());
int result = 0; int result = 0;
@ -488,7 +488,7 @@ public class Tester1 {
new ValueHolder<>(false); new ValueHolder<>(false);
SQLFunction func = new SQLFunction.Aggregate<Integer>(){ SQLFunction func = new SQLFunction.Aggregate<Integer>(){
@Override @Override
public void xStep(sqlite3_context cx, sqlite3_value args[]){ public void xStep(sqlite3_context cx, sqlite3_value[] args){
this.getAggregateState(cx, 0).value += sqlite3_value_int(args[0]); this.getAggregateState(cx, 0).value += sqlite3_value_int(args[0]);
} }
@Override @Override
@ -514,7 +514,7 @@ public class Tester1 {
affirm( 6 == v ); affirm( 6 == v );
++n; ++n;
} }
affirm( false == xFinalNull.value ); affirm(!xFinalNull.value);
sqlite3_reset(stmt); sqlite3_reset(stmt);
// Ensure that the accumulator is reset... // Ensure that the accumulator is reset...
n = 0; n = 0;
@ -538,11 +538,11 @@ public class Tester1 {
affirm( 12 == c1 ); affirm( 12 == c1 );
} }
affirm( 1 == n ); affirm( 1 == n );
affirm( false == xFinalNull.value ); affirm(!xFinalNull.value);
sqlite3_finalize(stmt); sqlite3_finalize(stmt);
execSql(db, "SELECT myfunc(1) WHERE 0"); execSql(db, "SELECT myfunc(1) WHERE 0");
affirm( true == xFinalNull.value ); affirm(xFinalNull.value);
sqlite3_close(db); sqlite3_close(db);
} }
@ -695,16 +695,16 @@ public class Tester1 {
// Force a locked condition... // Force a locked condition...
execSql(db1, "BEGIN EXCLUSIVE"); execSql(db1, "BEGIN EXCLUSIVE");
affirm( false == xDestroyed.value ); affirm(!xDestroyed.value);
sqlite3_stmt stmt = new sqlite3_stmt(); sqlite3_stmt stmt = new sqlite3_stmt();
rc = sqlite3_prepare(db2, "SELECT * from t", stmt); rc = sqlite3_prepare(db2, "SELECT * from t", stmt);
affirm( SQLITE_BUSY == rc); affirm( SQLITE_BUSY == rc);
affirm( 3 == xBusyCalled.value ); affirm( 3 == xBusyCalled.value );
sqlite3_finalize(stmt); sqlite3_finalize(stmt);
sqlite3_close(db1); sqlite3_close(db1);
affirm( false == xDestroyed.value ); affirm(!xDestroyed.value);
sqlite3_close(db2); sqlite3_close(db2);
affirm( true == xDestroyed.value ); affirm(xDestroyed.value);
try{ try{
final java.io.File f = new java.io.File(dbName); final java.io.File f = new java.io.File(dbName);
f.delete(); f.delete();

14
manifest
View File

@ -1,5 +1,5 @@
C Add\sJava\stests\swhich\sensure\sthat\sxFinal()\sis\scalled\swith\sno\saggregate\scontext\swhen\sthe\sresult\sset\sis\sempty. C Minor\sjava\scleanups\srecommended\sby\sa\smodern\sIDE.
D 2023-07-28T10:01:01.739 D 2023-07-28T10:37:17.675
F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@ -240,8 +240,8 @@ F ext/jni/src/org/sqlite/jni/NativePointerHolder.java 70dc7bc41f80352ff3d4331e2e
F ext/jni/src/org/sqlite/jni/OutputPointer.java 08a752b58a33696c5eaf0eb9361a0966b188dec40f4a3613eb133123951f6c5f F ext/jni/src/org/sqlite/jni/OutputPointer.java 08a752b58a33696c5eaf0eb9361a0966b188dec40f4a3613eb133123951f6c5f
F ext/jni/src/org/sqlite/jni/ProgressHandler.java 5a1d7b2607eb2ef596fcf4492a49d1b3a5bdea3af9918e11716831ffd2f02284 F ext/jni/src/org/sqlite/jni/ProgressHandler.java 5a1d7b2607eb2ef596fcf4492a49d1b3a5bdea3af9918e11716831ffd2f02284
F ext/jni/src/org/sqlite/jni/SQLFunction.java 663a4e479ec65bfbf893586439e12d30b8237898064a22ab64f5658b57315f37 F ext/jni/src/org/sqlite/jni/SQLFunction.java 663a4e479ec65bfbf893586439e12d30b8237898064a22ab64f5658b57315f37
F ext/jni/src/org/sqlite/jni/SQLite3Jni.java 3582b30c0fb1cb39e25b9069fe8c9e2fe4f2659f4d38437b610e46143e163610 F ext/jni/src/org/sqlite/jni/SQLite3Jni.java f7939d75d26481d02ea3418fa24bb6f6ba89b98a3e10ac4ab67b7186f9cb4fda
F ext/jni/src/org/sqlite/jni/Tester1.java 5cc3e28a1a1ee06d3a55117593acc432d08a9aa399a3a06dba5b994e91ca7cff F ext/jni/src/org/sqlite/jni/Tester1.java 6c819172137bf06d76f26df20c4c846abc82523db62c51cc043ac66031298103
F ext/jni/src/org/sqlite/jni/Tracer.java c2fe1eba4a76581b93b375a7b95ab1919e5ae60accfb06d6beb067b033e9bae1 F ext/jni/src/org/sqlite/jni/Tracer.java c2fe1eba4a76581b93b375a7b95ab1919e5ae60accfb06d6beb067b033e9bae1
F ext/jni/src/org/sqlite/jni/ValueHolder.java f022873abaabf64f3dd71ab0d6037c6e71cece3b8819fa10bf26a5461dc973ee F ext/jni/src/org/sqlite/jni/ValueHolder.java f022873abaabf64f3dd71ab0d6037c6e71cece3b8819fa10bf26a5461dc973ee
F ext/jni/src/org/sqlite/jni/sqlite3.java c7d0500c7269882243aafb41425928d094b2fcbdbc2fd1caffc276871cd3fae3 F ext/jni/src/org/sqlite/jni/sqlite3.java c7d0500c7269882243aafb41425928d094b2fcbdbc2fd1caffc276871cd3fae3
@ -2067,8 +2067,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
P 48e0079d8db675a8761f27348bc6795aa6b6e49a3f76bd4adece83309dcf2aff P 7ac8c66a6b62d6bb345e8b9957a26de463019ae7d30ff442f19482c3a6827fc7
R eae0975d651446c72791fe2a501172ec R e8f387c4dfdd92056cc99f13354e3b0d
U stephan U stephan
Z 694fd4327df7c4229eec43f11fc0825b Z f4a979401c828d3aa03901d37feaa60f
# Remove this line to create a well-formed Fossil manifest. # Remove this line to create a well-formed Fossil manifest.

2
manifest.uuid
View File

@ -1 +1 @@
7ac8c66a6b62d6bb345e8b9957a26de463019ae7d30ff442f19482c3a6827fc7 f92a9bbabebc33a771835e259b04a57d07add1eacf3d9aec5fddf929ce8a3022