diff --git a/ci/create_rc_discussion.sh b/ci/create_rc_discussion.sh index c508b723725..0ddad12948c 100755 --- a/ci/create_rc_discussion.sh +++ b/ci/create_rc_discussion.sh @@ -68,8 +68,8 @@ pip install --pre --extra-index-url https://pypi.fury.io/lance-format/pylance==$ Add to your \`pom.xml\`: \`\`\`xml - com.lancedb - lance + org.lance + lance-core ${RC_VERSION} \`\`\` diff --git a/java/README.md b/java/README.md index 930bd16a020..b49a4892527 100644 --- a/java/README.md +++ b/java/README.md @@ -32,7 +32,7 @@ Introduce the Lance SDK Java Maven dependency(It is recommended to choose the la ```shell - com.lancedb + org.lance lance-core 0.35.0 diff --git a/java/lance-jni/src/blocking_blob.rs b/java/lance-jni/src/blocking_blob.rs index b5ca4998394..6d14fb82bb9 100755 --- a/java/lance-jni/src/blocking_blob.rs +++ b/java/lance-jni/src/blocking_blob.rs @@ -12,7 +12,7 @@ use lance::dataset::BlobFile; use std::mem::transmute; use std::sync::Arc; -const BLOB_FILE_CLASS: &str = "com/lancedb/lance/BlobFile"; +const BLOB_FILE_CLASS: &str = "org/lance/BlobFile"; const BLOB_FILE_CTOR_SIG: &str = "()V"; const NATIVE_BLOB: &str = "nativeBlobHandle"; @@ -35,7 +35,7 @@ impl From for BlockingBlobFile { } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_Dataset_nativeTakeBlobs<'local>( +pub extern "system" fn Java_org_lance_Dataset_nativeTakeBlobs<'local>( mut env: JNIEnv<'local>, jdataset: JObject, row_ids_obj: JObject, // List @@ -87,7 +87,7 @@ fn transform_vec<'local>( } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_Dataset_nativeTakeBlobsByIndices<'local>( +pub extern "system" fn Java_org_lance_Dataset_nativeTakeBlobsByIndices<'local>( mut env: JNIEnv<'local>, jdataset: JObject, row_indices_obj: JObject, // List @@ -123,7 +123,7 @@ fn inner_take_blobs_by_indices<'local>( } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_BlobFile_nativeRead( +pub extern "system" fn Java_org_lance_BlobFile_nativeRead( mut env: JNIEnv, jblob: JObject, ) -> jbyteArray { @@ -148,7 +148,7 @@ fn inner_blob_read<'local>(env: &mut JNIEnv<'local>, jblob: JObject) -> Result( +pub extern "system" fn Java_org_lance_BlobFile_nativeReadUpTo<'local>( mut env: JNIEnv<'local>, jblob: JObject, len: jint, @@ -178,7 +178,7 @@ fn inner_blob_read_up_to<'local>( } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_BlobFile_nativeSeek( +pub extern "system" fn Java_org_lance_BlobFile_nativeSeek( mut env: JNIEnv, jblob: JObject, new_cursor: jlong, @@ -193,7 +193,7 @@ fn inner_blob_seek(env: &mut JNIEnv, jblob: JObject, new_cursor: jlong) -> Resul } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_BlobFile_nativeTell( +pub extern "system" fn Java_org_lance_BlobFile_nativeTell( mut env: JNIEnv, jblob: JObject, ) -> jlong { @@ -206,7 +206,7 @@ fn inner_blob_tell(env: &mut JNIEnv, jblob: JObject) -> Result { } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_BlobFile_nativeSize( +pub extern "system" fn Java_org_lance_BlobFile_nativeSize( mut env: JNIEnv, jblob: JObject, ) -> jlong { @@ -219,10 +219,7 @@ fn inner_blob_size(env: &mut JNIEnv, jblob: JObject) -> Result { } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_BlobFile_nativeClose( - mut env: JNIEnv, - jblob: JObject, -) { +pub extern "system" fn Java_org_lance_BlobFile_nativeClose(mut env: JNIEnv, jblob: JObject) { ok_or_throw_without_return!(env, inner_blob_close(&mut env, jblob)); } diff --git a/java/lance-jni/src/blocking_dataset.rs b/java/lance-jni/src/blocking_dataset.rs index c1896820f1e..b15132ad00b 100644 --- a/java/lance-jni/src/blocking_dataset.rs +++ b/java/lance-jni/src/blocking_dataset.rs @@ -324,7 +324,7 @@ impl BlockingDataset { // Write Methods // /////////////////// #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_Dataset_createWithFfiSchema<'local>( +pub extern "system" fn Java_org_lance_Dataset_createWithFfiSchema<'local>( mut env: JNIEnv<'local>, _obj: JObject, arrow_schema_addr: jlong, @@ -392,7 +392,7 @@ fn inner_create_with_ffi_schema<'local>( } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_Dataset_drop<'local>( +pub extern "system" fn Java_org_lance_Dataset_drop<'local>( mut env: JNIEnv<'local>, _obj: JObject, path: JString<'local>, @@ -406,7 +406,7 @@ pub extern "system" fn Java_com_lancedb_lance_Dataset_drop<'local>( } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_Dataset_createWithFfiStream<'local>( +pub extern "system" fn Java_org_lance_Dataset_createWithFfiStream<'local>( mut env: JNIEnv<'local>, _obj: JObject, arrow_array_stream_addr: jlong, @@ -440,7 +440,7 @@ pub extern "system" fn Java_com_lancedb_lance_Dataset_createWithFfiStream<'local } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_Dataset_createWithFfiStreamAndProvider<'local>( +pub extern "system" fn Java_org_lance_Dataset_createWithFfiStreamAndProvider<'local>( mut env: JNIEnv<'local>, _obj: JObject, arrow_array_stream_addr: jlong, @@ -570,7 +570,7 @@ impl IntoJava for Version { } let java_version = env.new_object( - "com/lancedb/lance/Version", + "org/lance/Version", "(JLjava/time/ZonedDateTime;Ljava/util/TreeMap;)V", &[ JValue::Long(self.version as i64), @@ -601,12 +601,12 @@ fn attach_native_dataset<'local>( } fn create_java_dataset_object<'a>(env: &mut JNIEnv<'a>) -> Result> { - let object = env.new_object("com/lancedb/lance/Dataset", "()V", &[])?; + let object = env.new_object("org/lance/Dataset", "()V", &[])?; Ok(object) } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_Dataset_commitAppend<'local>( +pub extern "system" fn Java_org_lance_Dataset_commitAppend<'local>( mut env: JNIEnv<'local>, _obj: JObject, path: JString, @@ -647,7 +647,7 @@ pub fn inner_commit_append<'local>( } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_Dataset_commitOverwrite<'local>( +pub extern "system" fn Java_org_lance_Dataset_commitOverwrite<'local>( mut env: JNIEnv<'local>, _obj: JObject, path: JString, @@ -702,10 +702,7 @@ pub fn inner_commit_overwrite<'local>( } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_Dataset_releaseNativeDataset( - mut env: JNIEnv, - obj: JObject, -) { +pub extern "system" fn Java_org_lance_Dataset_releaseNativeDataset(mut env: JNIEnv, obj: JObject) { ok_or_throw_without_return!(env, inner_release_native_dataset(&mut env, obj)) } @@ -716,7 +713,7 @@ fn inner_release_native_dataset(env: &mut JNIEnv, obj: JObject) -> Result<()> { } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_Dataset_nativeCreateIndex( +pub extern "system" fn Java_org_lance_Dataset_nativeCreateIndex( mut env: JNIEnv, java_dataset: JObject, columns_jobj: JObject, // List @@ -841,7 +838,7 @@ fn inner_create_index( } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_Dataset_innerMergeIndexMetadata<'local>( +pub extern "system" fn Java_org_lance_Dataset_innerMergeIndexMetadata<'local>( mut env: JNIEnv<'local>, java_dataset: JObject, index_uuid: JString, @@ -921,7 +918,7 @@ fn inner_merge_index_metadata( // Read Methods // ////////////////// #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_Dataset_openNative<'local>( +pub extern "system" fn Java_org_lance_Dataset_openNative<'local>( mut env: JNIEnv<'local>, _obj: JObject, path: JString, @@ -1042,7 +1039,7 @@ fn inner_open_native<'local>( } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_Dataset_getFragmentsNative<'a>( +pub extern "system" fn Java_org_lance_Dataset_getFragmentsNative<'a>( mut env: JNIEnv<'a>, jdataset: JObject, ) -> JObject<'a> { @@ -1066,7 +1063,7 @@ fn inner_get_fragments<'local>( } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_Dataset_getFragmentNative<'a>( +pub extern "system" fn Java_org_lance_Dataset_getFragmentNative<'a>( mut env: JNIEnv<'a>, jdataset: JObject, fragment_id: jint, @@ -1092,7 +1089,7 @@ fn inner_get_fragment<'local>( } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_Dataset_nativeGetLanceSchema<'local>( +pub extern "system" fn Java_org_lance_Dataset_nativeGetLanceSchema<'local>( mut env: JNIEnv<'local>, java_dataset: JObject, ) -> JObject<'local> { @@ -1112,7 +1109,7 @@ fn inner_get_lance_schema<'local>( } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_Dataset_importFfiSchema( +pub extern "system" fn Java_org_lance_Dataset_importFfiSchema( mut env: JNIEnv, jdataset: JObject, arrow_schema_addr: jlong, @@ -1140,7 +1137,7 @@ fn inner_import_ffi_schema( } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_Dataset_nativeUri<'local>( +pub extern "system" fn Java_org_lance_Dataset_nativeUri<'local>( mut env: JNIEnv<'local>, java_dataset: JObject, ) -> JString<'local> { @@ -1163,7 +1160,7 @@ fn inner_uri<'local>(env: &mut JNIEnv<'local>, java_dataset: JObject) -> Result< } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_Dataset_nativeListVersions<'local>( +pub extern "system" fn Java_org_lance_Dataset_nativeListVersions<'local>( mut env: JNIEnv<'local>, java_dataset: JObject, ) -> JObject<'local> { @@ -1199,7 +1196,7 @@ fn inner_list_versions<'local>( } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_Dataset_nativeGetVersion<'local>( +pub extern "system" fn Java_org_lance_Dataset_nativeGetVersion<'local>( mut env: JNIEnv<'local>, java_dataset: JObject, ) -> JObject<'local> { @@ -1219,7 +1216,7 @@ fn inner_get_version<'local>( } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_Dataset_nativeGetLatestVersionId( +pub extern "system" fn Java_org_lance_Dataset_nativeGetLatestVersionId( mut env: JNIEnv, java_dataset: JObject, ) -> jlong { @@ -1233,7 +1230,7 @@ fn inner_latest_version_id(env: &mut JNIEnv, java_dataset: JObject) -> Result Result<()> } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_Dataset_nativeCheckoutVersion<'local>( +pub extern "system" fn Java_org_lance_Dataset_nativeCheckoutVersion<'local>( mut env: JNIEnv<'local>, java_dataset: JObject, version: jlong, @@ -1270,7 +1267,7 @@ fn inner_checkout_version<'local>( } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_Dataset_nativeCheckoutTag<'local>( +pub extern "system" fn Java_org_lance_Dataset_nativeCheckoutTag<'local>( mut env: JNIEnv<'local>, java_dataset: JObject, jtag: JString, @@ -1294,7 +1291,7 @@ fn inner_checkout_tag<'local>( } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_Dataset_nativeRestore( +pub extern "system" fn Java_org_lance_Dataset_nativeRestore( mut env: JNIEnv, java_dataset: JObject, ) { @@ -1308,7 +1305,7 @@ fn inner_restore(env: &mut JNIEnv, java_dataset: JObject) -> Result<()> { } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_Dataset_nativeShallowClone<'local>( +pub extern "system" fn Java_org_lance_Dataset_nativeShallowClone<'local>( mut env: JNIEnv<'local>, java_dataset: JObject, target_path: JString, @@ -1381,7 +1378,7 @@ fn inner_shallow_clone<'local>( } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_Dataset_nativeCountRows( +pub extern "system" fn Java_org_lance_Dataset_nativeCountRows( mut env: JNIEnv, java_dataset: JObject, filter_jobj: JObject, // Optional @@ -1405,7 +1402,7 @@ fn inner_count_rows( } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_Dataset_nativeGetDataStatistics<'local>( +pub extern "system" fn Java_org_lance_Dataset_nativeGetDataStatistics<'local>( mut env: JNIEnv<'local>, java_dataset: JObject, ) -> JObject<'local> { @@ -1421,20 +1418,20 @@ fn inner_get_data_statistics<'local>( unsafe { env.get_rust_field::<_, _, BlockingDataset>(java_dataset, NATIVE_DATASET) }?; dataset_guard.calculate_data_stats()? }; - let data_stats = env.new_object("com/lancedb/lance/ipc/DataStatistics", "()V", &[])?; + let data_stats = env.new_object("org/lance/ipc/DataStatistics", "()V", &[])?; for field in stats.fields { let id = field.id as jint; let byte_size = field.bytes_on_disk as jlong; let filed_jobj = env.new_object( - "com/lancedb/lance/ipc/FieldStatistics", + "org/lance/ipc/FieldStatistics", "(IJ)V", &[JValue::Int(id), JValue::Long(byte_size)], )?; env.call_method( &data_stats, "addFiledStatistics", - "(Lcom/lancedb/lance/ipc/FieldStatistics;)V", + "(Lorg/lance/ipc/FieldStatistics;)V", &[JValue::Object(&filed_jobj)], )?; } @@ -1442,7 +1439,7 @@ fn inner_get_data_statistics<'local>( } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_Dataset_nativeListIndexes<'local>( +pub extern "system" fn Java_org_lance_Dataset_nativeListIndexes<'local>( mut env: JNIEnv<'local>, java_dataset: JObject, ) -> JObject<'local> { @@ -1479,7 +1476,7 @@ fn inner_list_indexes<'local>( } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_Dataset_nativeGetConfig<'local>( +pub extern "system" fn Java_org_lance_Dataset_nativeGetConfig<'local>( mut env: JNIEnv<'local>, java_dataset: JObject, ) -> JObject<'local> { @@ -1521,7 +1518,7 @@ fn inner_get_config<'local>( } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_Dataset_nativeTake( +pub extern "system" fn Java_org_lance_Dataset_nativeTake( mut env: JNIEnv, java_dataset: JObject, indices_obj: JObject, // List @@ -1574,7 +1571,7 @@ fn inner_take( } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_Dataset_nativeDelete( +pub extern "system" fn Java_org_lance_Dataset_nativeDelete( mut env: JNIEnv, java_dataset: JObject, predicate: JString, @@ -1594,7 +1591,7 @@ fn inner_delete(env: &mut JNIEnv, java_dataset: JObject, predicate: JString) -> // Schema evolution Methods // ////////////////////////////// #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_Dataset_nativeDropColumns( +pub extern "system" fn Java_org_lance_Dataset_nativeDropColumns( mut env: JNIEnv, java_dataset: JObject, columns_obj: JObject, // List @@ -1616,7 +1613,7 @@ fn inner_drop_columns( } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_Dataset_nativeAlterColumns( +pub extern "system" fn Java_org_lance_Dataset_nativeAlterColumns( mut env: JNIEnv, java_dataset: JObject, column_alterations_obj: JObject, // List @@ -1721,7 +1718,7 @@ fn inner_alter_columns( } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_Dataset_nativeAddColumnsBySqlExpressions( +pub extern "system" fn Java_org_lance_Dataset_nativeAddColumnsBySqlExpressions( mut env: JNIEnv, java_dataset: JObject, sql_expressions: JObject, // SqlExpressions @@ -1788,7 +1785,7 @@ fn inner_add_columns_by_sql_expressions( } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_Dataset_nativeAddColumnsByReader( +pub extern "system" fn Java_org_lance_Dataset_nativeAddColumnsByReader( mut env: JNIEnv, java_dataset: JObject, arrow_array_stream_addr: jlong, @@ -1835,7 +1832,7 @@ fn inner_add_columns_by_reader( } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_Dataset_nativeAddColumnsBySchema( +pub extern "system" fn Java_org_lance_Dataset_nativeAddColumnsBySchema( mut env: JNIEnv, java_dataset: JObject, schema_ptr: jlong, // Schema pointer @@ -1869,7 +1866,7 @@ fn inner_add_columns_by_schema( // Tag operation Methods // ////////////////////////////// #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_Dataset_nativeListTags<'local>( +pub extern "system" fn Java_org_lance_Dataset_nativeListTags<'local>( mut env: JNIEnv<'local>, java_dataset: JObject, ) -> JObject<'local> { @@ -1889,7 +1886,7 @@ fn inner_list_tags<'local>( for (tag_name, tag_contents) in tag_map { let java_tag = env.new_object( - "com/lancedb/lance/Tag", + "org/lance/Tag", "(Ljava/lang/String;JI)V", &[ JValue::Object(&env.new_string(tag_name)?.into()), @@ -1908,7 +1905,7 @@ fn inner_list_tags<'local>( } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_Dataset_nativeCreateTag( +pub extern "system" fn Java_org_lance_Dataset_nativeCreateTag( mut env: JNIEnv, java_dataset: JObject, jtag_name: JString, @@ -1921,7 +1918,7 @@ pub extern "system" fn Java_com_lancedb_lance_Dataset_nativeCreateTag( } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_Dataset_nativeCreateTagOnBranch( +pub extern "system" fn Java_org_lance_Dataset_nativeCreateTagOnBranch( mut env: JNIEnv, java_dataset: JObject, jtag_name: JString, @@ -1963,7 +1960,7 @@ fn inner_create_tag_on_branch( } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_Dataset_nativeDeleteTag( +pub extern "system" fn Java_org_lance_Dataset_nativeDeleteTag( mut env: JNIEnv, java_dataset: JObject, jtag_name: JString, @@ -1979,7 +1976,7 @@ fn inner_delete_tag(env: &mut JNIEnv, java_dataset: JObject, jtag_name: JString) } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_Dataset_nativeUpdateTag( +pub extern "system" fn Java_org_lance_Dataset_nativeUpdateTag( mut env: JNIEnv, java_dataset: JObject, jtag_name: JString, @@ -1992,7 +1989,7 @@ pub extern "system" fn Java_com_lancedb_lance_Dataset_nativeUpdateTag( } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_Dataset_nativeUpdateTagOnBranch( +pub extern "system" fn Java_org_lance_Dataset_nativeUpdateTagOnBranch( mut env: JNIEnv, java_dataset: JObject, jtag_name: JString, @@ -2034,7 +2031,7 @@ fn inner_update_tag( } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_Dataset_nativeGetVersionByTag( +pub extern "system" fn Java_org_lance_Dataset_nativeGetVersionByTag( mut env: JNIEnv, java_dataset: JObject, jtag_name: JString, @@ -2061,7 +2058,7 @@ fn inner_get_version_by_tag( // Branch operation Methods // ////////////////////////////// #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_Dataset_nativeListBranches<'local>( +pub extern "system" fn Java_org_lance_Dataset_nativeListBranches<'local>( mut env: JNIEnv<'local>, java_dataset: JObject, ) -> JObject<'local> { @@ -2087,7 +2084,7 @@ fn inner_list_branches<'local>( JObject::null() }; let jbranch = env.new_object( - "com/lancedb/lance/Branch", + "org/lance/Branch", "(Ljava/lang/String;Ljava/lang/String;JJI)V", &[ JValue::Object(&jname), @@ -2108,7 +2105,7 @@ fn inner_list_branches<'local>( } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_Dataset_nativeCreateBranch<'local>( +pub extern "system" fn Java_org_lance_Dataset_nativeCreateBranch<'local>( mut env: JNIEnv<'local>, java_dataset: JObject, jbranch: JString, @@ -2140,7 +2137,7 @@ fn inner_create_branch<'local>( } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_Dataset_nativeCreateBranchOnTag<'local>( +pub extern "system" fn Java_org_lance_Dataset_nativeCreateBranchOnTag<'local>( mut env: JNIEnv<'local>, java_dataset: JObject, jbranch: JString, @@ -2176,7 +2173,7 @@ fn inner_create_branch_on_tag<'local>( } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_Dataset_nativeDeleteBranch( +pub extern "system" fn Java_org_lance_Dataset_nativeDeleteBranch( mut env: JNIEnv, java_dataset: JObject, jbranch: JString, @@ -2192,7 +2189,7 @@ fn inner_delete_branch(env: &mut JNIEnv, java_dataset: JObject, jbranch: JString } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_Dataset_nativeCheckout<'local>( +pub extern "system" fn Java_org_lance_Dataset_nativeCheckout<'local>( mut env: JNIEnv<'local>, java_dataset: JObject, reference_obj: JObject, // Reference @@ -2244,7 +2241,7 @@ fn inner_checkout_ref<'local>( // Unified metadata API JNI methods #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_Dataset_nativeGetTableMetadata<'local>( +pub extern "system" fn Java_org_lance_Dataset_nativeGetTableMetadata<'local>( mut env: JNIEnv<'local>, java_dataset: JObject, ) -> JObject<'local> { @@ -2289,7 +2286,7 @@ fn inner_get_table_metadata<'local>( // Compaction Methods // ////////////////////////////// #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_Dataset_nativeCompact( +pub extern "system" fn Java_org_lance_Dataset_nativeCompact( mut env: JNIEnv, java_dataset: JObject, compaction_options: JObject, // CompactionOptions @@ -2390,7 +2387,7 @@ fn convert_java_compaction_options_to_rust( } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_Dataset_nativeCleanupWithPolicy<'local>( +pub extern "system" fn Java_org_lance_Dataset_nativeCleanupWithPolicy<'local>( mut env: JNIEnv<'local>, jdataset: JObject, jpolicy: JObject, @@ -2438,7 +2435,7 @@ fn inner_cleanup_with_policy<'local>( }?; let jstats = env.new_object( - "com/lancedb/lance/cleanup/RemovalStats", + "org/lance/cleanup/RemovalStats", "(JJ)V", &[ JValue::Long(stats.bytes_removed as i64), diff --git a/java/lance-jni/src/blocking_scanner.rs b/java/lance-jni/src/blocking_scanner.rs index c97cbbc170a..4790219b09a 100644 --- a/java/lance-jni/src/blocking_scanner.rs +++ b/java/lance-jni/src/blocking_scanner.rs @@ -55,7 +55,7 @@ impl BlockingScanner { // Write Methods // /////////////////// #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_ipc_LanceScanner_createScanner<'local>( +pub extern "system" fn Java_org_lance_ipc_LanceScanner_createScanner<'local>( mut env: JNIEnv<'local>, _reader: JObject, jdataset: JObject, @@ -240,7 +240,7 @@ fn inner_create_scanner<'local>( } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_ipc_LanceScanner_releaseNativeScanner( +pub extern "system" fn Java_org_lance_ipc_LanceScanner_releaseNativeScanner( mut env: JNIEnv, j_scanner: JObject, ) { @@ -277,7 +277,7 @@ fn attach_native_scanner<'local>( } fn create_java_scanner_object<'a>(env: &mut JNIEnv<'a>) -> Result> { - let res = env.new_object("com/lancedb/lance/ipc/LanceScanner", "()V", &[])?; + let res = env.new_object("org/lance/ipc/LanceScanner", "()V", &[])?; Ok(res) } @@ -285,7 +285,7 @@ fn create_java_scanner_object<'a>(env: &mut JNIEnv<'a>) -> Result> { // Read Methods // ////////////////// #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_ipc_LanceScanner_openStream( +pub extern "system" fn Java_org_lance_ipc_LanceScanner_openStream( mut env: JNIEnv, j_scanner: JObject, stream_addr: jlong, @@ -305,7 +305,7 @@ fn inner_open_stream(env: &mut JNIEnv, j_scanner: JObject, stream_addr: jlong) - } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_ipc_LanceScanner_importFfiSchema( +pub extern "system" fn Java_org_lance_ipc_LanceScanner_importFfiSchema( mut env: JNIEnv, j_scanner: JObject, schema_addr: jlong, @@ -328,7 +328,7 @@ fn inner_import_ffi_schema(env: &mut JNIEnv, j_scanner: JObject, schema_addr: jl } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_ipc_LanceScanner_nativeCountRows( +pub extern "system" fn Java_org_lance_ipc_LanceScanner_nativeCountRows( mut env: JNIEnv, j_scanner: JObject, ) -> jlong { diff --git a/java/lance-jni/src/ffi.rs b/java/lance-jni/src/ffi.rs index 18a5831d051..8206b49a005 100644 --- a/java/lance-jni/src/ffi.rs +++ b/java/lance-jni/src/ffi.rs @@ -462,7 +462,7 @@ impl JNIEnvExt for JNIEnv<'_> { } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_test_JniTestHelper_parseInts( +pub extern "system" fn Java_org_lance_test_JniTestHelper_parseInts( mut env: JNIEnv, _obj: JObject, list_obj: JObject, // List @@ -471,7 +471,7 @@ pub extern "system" fn Java_com_lancedb_lance_test_JniTestHelper_parseInts( } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_test_JniTestHelper_parseLongs( +pub extern "system" fn Java_org_lance_test_JniTestHelper_parseLongs( mut env: JNIEnv, _obj: JObject, list_obj: JObject, // List @@ -480,7 +480,7 @@ pub extern "system" fn Java_com_lancedb_lance_test_JniTestHelper_parseLongs( } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_test_JniTestHelper_parseIntsOpt( +pub extern "system" fn Java_org_lance_test_JniTestHelper_parseIntsOpt( mut env: JNIEnv, _obj: JObject, list_obj: JObject, // Optional> @@ -489,7 +489,7 @@ pub extern "system" fn Java_com_lancedb_lance_test_JniTestHelper_parseIntsOpt( } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_test_JniTestHelper_parseQuery( +pub extern "system" fn Java_org_lance_test_JniTestHelper_parseQuery( mut env: JNIEnv, _obj: JObject, query_opt: JObject, // Optional @@ -498,7 +498,7 @@ pub extern "system" fn Java_com_lancedb_lance_test_JniTestHelper_parseQuery( } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_test_JniTestHelper_parseIndexParams( +pub extern "system" fn Java_org_lance_test_JniTestHelper_parseIndexParams( mut env: JNIEnv, _obj: JObject, index_params_obj: JObject, // IndexParams diff --git a/java/lance-jni/src/file_reader.rs b/java/lance-jni/src/file_reader.rs index dca3c858699..11591b3acea 100644 --- a/java/lance-jni/src/file_reader.rs +++ b/java/lance-jni/src/file_reader.rs @@ -88,12 +88,12 @@ fn attach_native_reader<'local>( } fn create_java_reader_object<'a>(env: &mut JNIEnv<'a>) -> Result> { - let res = env.new_object("com/lancedb/lance/file/LanceFileReader", "()V", &[])?; + let res = env.new_object("org/lance/file/LanceFileReader", "()V", &[])?; Ok(res) } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_file_LanceFileReader_openNative<'local>( +pub extern "system" fn Java_org_lance_file_LanceFileReader_openNative<'local>( mut env: JNIEnv<'local>, _reader_class: JObject, file_uri: JString, @@ -143,7 +143,7 @@ fn inner_open<'local>( } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_file_LanceFileReader_closeNative<'local>( +pub extern "system" fn Java_org_lance_file_LanceFileReader_closeNative<'local>( mut env: JNIEnv<'local>, reader: JObject, ) -> JObject<'local> { @@ -159,7 +159,7 @@ pub extern "system" fn Java_com_lancedb_lance_file_LanceFileReader_closeNative<' } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_file_LanceFileReader_numRowsNative( +pub extern "system" fn Java_org_lance_file_LanceFileReader_numRowsNative( mut env: JNIEnv<'_>, reader: JObject, ) -> jlong { @@ -191,7 +191,7 @@ fn inner_num_rows(env: &mut JNIEnv<'_>, reader: JObject) -> Result { } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_file_LanceFileReader_populateSchemaNative( +pub extern "system" fn Java_org_lance_file_LanceFileReader_populateSchemaNative( mut env: JNIEnv, reader: JObject, schema_addr: jlong, @@ -209,7 +209,7 @@ fn inner_populate_schema(env: &mut JNIEnv, reader: JObject, schema_addr: jlong) } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_file_LanceFileReader_readAllNative( +pub extern "system" fn Java_org_lance_file_LanceFileReader_readAllNative( mut env: JNIEnv<'_>, reader: JObject, batch_size: jint, diff --git a/java/lance-jni/src/file_writer.rs b/java/lance-jni/src/file_writer.rs index ab2501124e9..57d6a2be570 100644 --- a/java/lance-jni/src/file_writer.rs +++ b/java/lance-jni/src/file_writer.rs @@ -58,12 +58,12 @@ fn attach_native_writer<'local>( } fn create_java_writer_object<'a>(env: &mut JNIEnv<'a>) -> Result> { - let res = env.new_object("com/lancedb/lance/file/LanceFileWriter", "()V", &[])?; + let res = env.new_object("org/lance/file/LanceFileWriter", "()V", &[])?; Ok(res) } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_file_LanceFileWriter_openNative<'local>( +pub extern "system" fn Java_org_lance_file_LanceFileWriter_openNative<'local>( mut env: JNIEnv<'local>, _writer_class: JObject, file_uri: JString, @@ -123,7 +123,7 @@ fn inner_open<'local>( } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_file_LanceFileWriter_closeNative<'local>( +pub extern "system" fn Java_org_lance_file_LanceFileWriter_closeNative<'local>( mut env: JNIEnv<'local>, writer: JObject, ) -> JObject<'local> { @@ -150,7 +150,7 @@ pub extern "system" fn Java_com_lancedb_lance_file_LanceFileWriter_closeNative<' } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_file_LanceFileWriter_writeNative<'local>( +pub extern "system" fn Java_org_lance_file_LanceFileWriter_writeNative<'local>( mut env: JNIEnv<'local>, writer: JObject, batch_address: jlong, diff --git a/java/lance-jni/src/fragment.rs b/java/lance-jni/src/fragment.rs index 9cee53a1108..775ad0d906d 100644 --- a/java/lance-jni/src/fragment.rs +++ b/java/lance-jni/src/fragment.rs @@ -45,7 +45,7 @@ pub(crate) struct FragmentUpdateResult { // Read Methods // ////////////////// #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_Fragment_countRowsNative( +pub extern "system" fn Java_org_lance_Fragment_countRowsNative( mut env: JNIEnv, _jfragment: JObject, jdataset: JObject, @@ -77,7 +77,7 @@ fn inner_count_rows_native( // Write Methods // /////////////////// #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_Fragment_createWithFfiArray<'local>( +pub extern "system" fn Java_org_lance_Fragment_createWithFfiArray<'local>( mut env: JNIEnv<'local>, _obj: JObject, dataset_uri: JString, @@ -160,7 +160,7 @@ fn inner_create_with_ffi_array<'local>( } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_Fragment_createWithFfiStream<'a>( +pub extern "system" fn Java_org_lance_Fragment_createWithFfiStream<'a>( mut env: JNIEnv<'a>, _obj: JObject, dataset_uri: JString, @@ -268,7 +268,7 @@ fn create_fragment<'a>( } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_Fragment_nativeDeleteRows<'a>( +pub extern "system" fn Java_org_lance_Fragment_nativeDeleteRows<'a>( mut env: JNIEnv<'a>, _obj: JObject, jdataset: JObject, @@ -322,7 +322,7 @@ fn inner_delete_rows<'local>( } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_Fragment_nativeMergeColumns<'a>( +pub extern "system" fn Java_org_lance_Fragment_nativeMergeColumns<'a>( mut env: JNIEnv<'a>, _obj: JObject, jdataset: JObject, // Java DataSet @@ -386,7 +386,7 @@ fn inner_merge_column<'local>( } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_Fragment_nativeUpdateColumns<'a>( +pub extern "system" fn Java_org_lance_Fragment_nativeUpdateColumns<'a>( mut env: JNIEnv<'a>, _obj: JObject, jdataset: JObject, // Java DataSet @@ -443,22 +443,22 @@ fn inner_update_column<'local>( result.into_java(env) } -const DATA_FILE_CLASS: &str = "com/lancedb/lance/fragment/DataFile"; +const DATA_FILE_CLASS: &str = "org/lance/fragment/DataFile"; const DATA_FILE_CONSTRUCTOR_SIG: &str = "(Ljava/lang/String;[I[IIILjava/lang/Long;Ljava/lang/Integer;)V"; -const DELETE_FILE_CLASS: &str = "com/lancedb/lance/fragment/DeletionFile"; +const DELETE_FILE_CLASS: &str = "org/lance/fragment/DeletionFile"; const DELETE_FILE_CONSTRUCTOR_SIG: &str = - "(JJLjava/lang/Long;Lcom/lancedb/lance/fragment/DeletionFileType;Ljava/lang/Integer;)V"; -const DELETE_FILE_TYPE_CLASS: &str = "com/lancedb/lance/fragment/DeletionFileType"; -const FRAGMENT_METADATA_CLASS: &str = "com/lancedb/lance/FragmentMetadata"; -const FRAGMENT_METADATA_CONSTRUCTOR_SIG: &str ="(ILjava/util/List;Ljava/lang/Long;Lcom/lancedb/lance/fragment/DeletionFile;Lcom/lancedb/lance/fragment/RowIdMeta;)V"; -const ROW_ID_META_CLASS: &str = "com/lancedb/lance/fragment/RowIdMeta"; + "(JJLjava/lang/Long;Lorg/lance/fragment/DeletionFileType;Ljava/lang/Integer;)V"; +const DELETE_FILE_TYPE_CLASS: &str = "org/lance/fragment/DeletionFileType"; +const FRAGMENT_METADATA_CLASS: &str = "org/lance/FragmentMetadata"; +const FRAGMENT_METADATA_CONSTRUCTOR_SIG: &str ="(ILjava/util/List;Ljava/lang/Long;Lorg/lance/fragment/DeletionFile;Lorg/lance/fragment/RowIdMeta;)V"; +const ROW_ID_META_CLASS: &str = "org/lance/fragment/RowIdMeta"; const ROW_ID_META_CONSTRUCTOR_SIG: &str = "(Ljava/lang/String;)V"; -const FRAGMENT_MERGE_RESULT_CLASS: &str = "com/lancedb/lance/fragment/FragmentMergeResult"; +const FRAGMENT_MERGE_RESULT_CLASS: &str = "org/lance/fragment/FragmentMergeResult"; const FRAGMENT_MERGE_RESULT_CONSTRUCTOR_SIG: &str = - "(Lcom/lancedb/lance/FragmentMetadata;Lcom/lancedb/lance/schema/LanceSchema;)V"; -const FRAGMENT_UPDATE_RESULT_CLASS: &str = "com/lancedb/lance/fragment/FragmentUpdateResult"; -const FRAGMENT_UPDATE_RESULT_CONSTRUCTOR_SIG: &str = "(Lcom/lancedb/lance/FragmentMetadata;[J)V"; + "(Lorg/lance/FragmentMetadata;Lorg/lance/schema/LanceSchema;)V"; +const FRAGMENT_UPDATE_RESULT_CLASS: &str = "org/lance/fragment/FragmentUpdateResult"; +const FRAGMENT_UPDATE_RESULT_CONSTRUCTOR_SIG: &str = "(Lorg/lance/FragmentMetadata;[J)V"; impl IntoJava for &FragmentMergeResult { fn into_java<'a>(self, env: &mut JNIEnv<'a>) -> Result> { diff --git a/java/lance-jni/src/lib.rs b/java/lance-jni/src/lib.rs index 0cc43865538..850b70350d4 100644 --- a/java/lance-jni/src/lib.rs +++ b/java/lance-jni/src/lib.rs @@ -134,7 +134,7 @@ fn set_log_file_target(builder: &mut env_logger::Builder) { } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_JniLoader_initLanceLogger() { +pub extern "system" fn Java_org_lance_JniLoader_initLanceLogger() { let env = Env::new() .filter_or("LANCE_LOG", "warn") .write_style("LANCE_LOG_STYLE"); diff --git a/java/lance-jni/src/merge_insert.rs b/java/lance-jni/src/merge_insert.rs index 3fe9a6742f2..19ac731a83c 100644 --- a/java/lance-jni/src/merge_insert.rs +++ b/java/lance-jni/src/merge_insert.rs @@ -18,7 +18,7 @@ use std::sync::Arc; use std::time::Duration; #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_Dataset_nativeMergeInsert<'a>( +pub extern "system" fn Java_org_lance_Dataset_nativeMergeInsert<'a>( mut env: JNIEnv<'a>, jdataset: JObject, // Dataset object jparam: JObject, // MergeInsertParams object @@ -228,11 +228,11 @@ fn extract_skip_auto_cleanup<'local>(env: &mut JNIEnv<'local>, jparam: &JObject) Ok(skip_auto_cleanup) } -const MERGE_STATS_CLASS: &str = "com/lancedb/lance/merge/MergeInsertStats"; +const MERGE_STATS_CLASS: &str = "org/lance/merge/MergeInsertStats"; const MERGE_STATS_CONSTRUCTOR_SIG: &str = "(JJJIJJ)V"; -const MERGE_RESULT_CLASS: &str = "com/lancedb/lance/merge/MergeInsertResult"; +const MERGE_RESULT_CLASS: &str = "org/lance/merge/MergeInsertResult"; const MERGE_RESULT_CONSTRUCTOR_SIG: &str = - "(Lcom/lancedb/lance/Dataset;Lcom/lancedb/lance/merge/MergeInsertStats;)V"; + "(Lorg/lance/Dataset;Lorg/lance/merge/MergeInsertStats;)V"; impl IntoJava for MergeStats { fn into_java<'a>(self, env: &mut JNIEnv<'a>) -> Result> { diff --git a/java/lance-jni/src/namespace.rs b/java/lance-jni/src/namespace.rs index cdfc2575768..70f4d27f626 100644 --- a/java/lance-jni/src/namespace.rs +++ b/java/lance-jni/src/namespace.rs @@ -33,7 +33,7 @@ pub struct BlockingRestNamespace { // ============================================================================ #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_namespace_DirectoryNamespace_createNative( +pub extern "system" fn Java_org_lance_namespace_DirectoryNamespace_createNative( mut env: JNIEnv, _obj: JObject, properties_map: JObject, @@ -65,7 +65,7 @@ fn create_directory_namespace_internal(env: &mut JNIEnv, properties_map: JObject } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_namespace_DirectoryNamespace_releaseNative( +pub extern "system" fn Java_org_lance_namespace_DirectoryNamespace_releaseNative( _env: JNIEnv, _obj: JObject, handle: jlong, @@ -78,7 +78,7 @@ pub extern "system" fn Java_com_lancedb_lance_namespace_DirectoryNamespace_relea } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_namespace_DirectoryNamespace_namespaceIdNative( +pub extern "system" fn Java_org_lance_namespace_DirectoryNamespace_namespaceIdNative( mut env: JNIEnv, _obj: JObject, handle: jlong, @@ -94,7 +94,7 @@ pub extern "system" fn Java_com_lancedb_lance_namespace_DirectoryNamespace_names } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_namespace_DirectoryNamespace_listNamespacesNative( +pub extern "system" fn Java_org_lance_namespace_DirectoryNamespace_listNamespacesNative( mut env: JNIEnv, _obj: JObject, handle: jlong, @@ -111,7 +111,7 @@ pub extern "system" fn Java_com_lancedb_lance_namespace_DirectoryNamespace_listN } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_namespace_DirectoryNamespace_describeNamespaceNative( +pub extern "system" fn Java_org_lance_namespace_DirectoryNamespace_describeNamespaceNative( mut env: JNIEnv, _obj: JObject, handle: jlong, @@ -128,7 +128,7 @@ pub extern "system" fn Java_com_lancedb_lance_namespace_DirectoryNamespace_descr } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_namespace_DirectoryNamespace_createNamespaceNative( +pub extern "system" fn Java_org_lance_namespace_DirectoryNamespace_createNamespaceNative( mut env: JNIEnv, _obj: JObject, handle: jlong, @@ -145,7 +145,7 @@ pub extern "system" fn Java_com_lancedb_lance_namespace_DirectoryNamespace_creat } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_namespace_DirectoryNamespace_dropNamespaceNative( +pub extern "system" fn Java_org_lance_namespace_DirectoryNamespace_dropNamespaceNative( mut env: JNIEnv, _obj: JObject, handle: jlong, @@ -162,7 +162,7 @@ pub extern "system" fn Java_com_lancedb_lance_namespace_DirectoryNamespace_dropN } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_namespace_DirectoryNamespace_namespaceExistsNative( +pub extern "system" fn Java_org_lance_namespace_DirectoryNamespace_namespaceExistsNative( mut env: JNIEnv, _obj: JObject, handle: jlong, @@ -177,7 +177,7 @@ pub extern "system" fn Java_com_lancedb_lance_namespace_DirectoryNamespace_names } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_namespace_DirectoryNamespace_listTablesNative( +pub extern "system" fn Java_org_lance_namespace_DirectoryNamespace_listTablesNative( mut env: JNIEnv, _obj: JObject, handle: jlong, @@ -194,7 +194,7 @@ pub extern "system" fn Java_com_lancedb_lance_namespace_DirectoryNamespace_listT } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_namespace_DirectoryNamespace_describeTableNative( +pub extern "system" fn Java_org_lance_namespace_DirectoryNamespace_describeTableNative( mut env: JNIEnv, _obj: JObject, handle: jlong, @@ -211,7 +211,7 @@ pub extern "system" fn Java_com_lancedb_lance_namespace_DirectoryNamespace_descr } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_namespace_DirectoryNamespace_registerTableNative( +pub extern "system" fn Java_org_lance_namespace_DirectoryNamespace_registerTableNative( mut env: JNIEnv, _obj: JObject, handle: jlong, @@ -228,7 +228,7 @@ pub extern "system" fn Java_com_lancedb_lance_namespace_DirectoryNamespace_regis } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_namespace_DirectoryNamespace_tableExistsNative( +pub extern "system" fn Java_org_lance_namespace_DirectoryNamespace_tableExistsNative( mut env: JNIEnv, _obj: JObject, handle: jlong, @@ -243,7 +243,7 @@ pub extern "system" fn Java_com_lancedb_lance_namespace_DirectoryNamespace_table } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_namespace_DirectoryNamespace_dropTableNative( +pub extern "system" fn Java_org_lance_namespace_DirectoryNamespace_dropTableNative( mut env: JNIEnv, _obj: JObject, handle: jlong, @@ -260,7 +260,7 @@ pub extern "system" fn Java_com_lancedb_lance_namespace_DirectoryNamespace_dropT } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_namespace_DirectoryNamespace_deregisterTableNative( +pub extern "system" fn Java_org_lance_namespace_DirectoryNamespace_deregisterTableNative( mut env: JNIEnv, _obj: JObject, handle: jlong, @@ -277,7 +277,7 @@ pub extern "system" fn Java_com_lancedb_lance_namespace_DirectoryNamespace_dereg } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_namespace_DirectoryNamespace_countTableRowsNative( +pub extern "system" fn Java_org_lance_namespace_DirectoryNamespace_countTableRowsNative( mut env: JNIEnv, _obj: JObject, handle: jlong, @@ -291,7 +291,7 @@ pub extern "system" fn Java_com_lancedb_lance_namespace_DirectoryNamespace_count } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_namespace_DirectoryNamespace_createTableNative( +pub extern "system" fn Java_org_lance_namespace_DirectoryNamespace_createTableNative( mut env: JNIEnv, _obj: JObject, handle: jlong, @@ -313,7 +313,7 @@ pub extern "system" fn Java_com_lancedb_lance_namespace_DirectoryNamespace_creat } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_namespace_DirectoryNamespace_createEmptyTableNative( +pub extern "system" fn Java_org_lance_namespace_DirectoryNamespace_createEmptyTableNative( mut env: JNIEnv, _obj: JObject, handle: jlong, @@ -330,7 +330,7 @@ pub extern "system" fn Java_com_lancedb_lance_namespace_DirectoryNamespace_creat } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_namespace_DirectoryNamespace_insertIntoTableNative( +pub extern "system" fn Java_org_lance_namespace_DirectoryNamespace_insertIntoTableNative( mut env: JNIEnv, _obj: JObject, handle: jlong, @@ -352,7 +352,7 @@ pub extern "system" fn Java_com_lancedb_lance_namespace_DirectoryNamespace_inser } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_namespace_DirectoryNamespace_mergeInsertIntoTableNative( +pub extern "system" fn Java_org_lance_namespace_DirectoryNamespace_mergeInsertIntoTableNative( mut env: JNIEnv, _obj: JObject, handle: jlong, @@ -374,7 +374,7 @@ pub extern "system" fn Java_com_lancedb_lance_namespace_DirectoryNamespace_merge } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_namespace_DirectoryNamespace_updateTableNative( +pub extern "system" fn Java_org_lance_namespace_DirectoryNamespace_updateTableNative( mut env: JNIEnv, _obj: JObject, handle: jlong, @@ -391,7 +391,7 @@ pub extern "system" fn Java_com_lancedb_lance_namespace_DirectoryNamespace_updat } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_namespace_DirectoryNamespace_deleteFromTableNative( +pub extern "system" fn Java_org_lance_namespace_DirectoryNamespace_deleteFromTableNative( mut env: JNIEnv, _obj: JObject, handle: jlong, @@ -408,7 +408,7 @@ pub extern "system" fn Java_com_lancedb_lance_namespace_DirectoryNamespace_delet } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_namespace_DirectoryNamespace_queryTableNative( +pub extern "system" fn Java_org_lance_namespace_DirectoryNamespace_queryTableNative( mut env: JNIEnv, _obj: JObject, handle: jlong, @@ -423,7 +423,7 @@ pub extern "system" fn Java_com_lancedb_lance_namespace_DirectoryNamespace_query } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_namespace_DirectoryNamespace_createTableIndexNative( +pub extern "system" fn Java_org_lance_namespace_DirectoryNamespace_createTableIndexNative( mut env: JNIEnv, _obj: JObject, handle: jlong, @@ -440,7 +440,7 @@ pub extern "system" fn Java_com_lancedb_lance_namespace_DirectoryNamespace_creat } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_namespace_DirectoryNamespace_listTableIndicesNative( +pub extern "system" fn Java_org_lance_namespace_DirectoryNamespace_listTableIndicesNative( mut env: JNIEnv, _obj: JObject, handle: jlong, @@ -457,7 +457,7 @@ pub extern "system" fn Java_com_lancedb_lance_namespace_DirectoryNamespace_listT } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_namespace_DirectoryNamespace_describeTableIndexStatsNative( +pub extern "system" fn Java_org_lance_namespace_DirectoryNamespace_describeTableIndexStatsNative( mut env: JNIEnv, _obj: JObject, handle: jlong, @@ -474,7 +474,7 @@ pub extern "system" fn Java_com_lancedb_lance_namespace_DirectoryNamespace_descr } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_namespace_DirectoryNamespace_describeTransactionNative( +pub extern "system" fn Java_org_lance_namespace_DirectoryNamespace_describeTransactionNative( mut env: JNIEnv, _obj: JObject, handle: jlong, @@ -491,7 +491,7 @@ pub extern "system" fn Java_com_lancedb_lance_namespace_DirectoryNamespace_descr } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_namespace_DirectoryNamespace_alterTransactionNative( +pub extern "system" fn Java_org_lance_namespace_DirectoryNamespace_alterTransactionNative( mut env: JNIEnv, _obj: JObject, handle: jlong, @@ -512,7 +512,7 @@ pub extern "system" fn Java_com_lancedb_lance_namespace_DirectoryNamespace_alter // ============================================================================ #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_namespace_RestNamespace_createNative( +pub extern "system" fn Java_org_lance_namespace_RestNamespace_createNative( mut env: JNIEnv, _obj: JObject, properties_map: JObject, @@ -542,7 +542,7 @@ fn create_rest_namespace_internal(env: &mut JNIEnv, properties_map: JObject) -> } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_namespace_RestNamespace_releaseNative( +pub extern "system" fn Java_org_lance_namespace_RestNamespace_releaseNative( _env: JNIEnv, _obj: JObject, handle: jlong, @@ -555,7 +555,7 @@ pub extern "system" fn Java_com_lancedb_lance_namespace_RestNamespace_releaseNat } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_namespace_RestNamespace_namespaceIdNative( +pub extern "system" fn Java_org_lance_namespace_RestNamespace_namespaceIdNative( mut env: JNIEnv, _obj: JObject, handle: jlong, @@ -571,7 +571,7 @@ pub extern "system" fn Java_com_lancedb_lance_namespace_RestNamespace_namespaceI } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_namespace_RestNamespace_listNamespacesNative( +pub extern "system" fn Java_org_lance_namespace_RestNamespace_listNamespacesNative( mut env: JNIEnv, _obj: JObject, handle: jlong, @@ -588,7 +588,7 @@ pub extern "system" fn Java_com_lancedb_lance_namespace_RestNamespace_listNamesp } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_namespace_RestNamespace_describeNamespaceNative( +pub extern "system" fn Java_org_lance_namespace_RestNamespace_describeNamespaceNative( mut env: JNIEnv, _obj: JObject, handle: jlong, @@ -605,7 +605,7 @@ pub extern "system" fn Java_com_lancedb_lance_namespace_RestNamespace_describeNa } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_namespace_RestNamespace_createNamespaceNative( +pub extern "system" fn Java_org_lance_namespace_RestNamespace_createNamespaceNative( mut env: JNIEnv, _obj: JObject, handle: jlong, @@ -622,7 +622,7 @@ pub extern "system" fn Java_com_lancedb_lance_namespace_RestNamespace_createName } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_namespace_RestNamespace_dropNamespaceNative( +pub extern "system" fn Java_org_lance_namespace_RestNamespace_dropNamespaceNative( mut env: JNIEnv, _obj: JObject, handle: jlong, @@ -639,7 +639,7 @@ pub extern "system" fn Java_com_lancedb_lance_namespace_RestNamespace_dropNamesp } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_namespace_RestNamespace_namespaceExistsNative( +pub extern "system" fn Java_org_lance_namespace_RestNamespace_namespaceExistsNative( mut env: JNIEnv, _obj: JObject, handle: jlong, @@ -654,7 +654,7 @@ pub extern "system" fn Java_com_lancedb_lance_namespace_RestNamespace_namespaceE } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_namespace_RestNamespace_listTablesNative( +pub extern "system" fn Java_org_lance_namespace_RestNamespace_listTablesNative( mut env: JNIEnv, _obj: JObject, handle: jlong, @@ -671,7 +671,7 @@ pub extern "system" fn Java_com_lancedb_lance_namespace_RestNamespace_listTables } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_namespace_RestNamespace_describeTableNative( +pub extern "system" fn Java_org_lance_namespace_RestNamespace_describeTableNative( mut env: JNIEnv, _obj: JObject, handle: jlong, @@ -688,7 +688,7 @@ pub extern "system" fn Java_com_lancedb_lance_namespace_RestNamespace_describeTa } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_namespace_RestNamespace_registerTableNative( +pub extern "system" fn Java_org_lance_namespace_RestNamespace_registerTableNative( mut env: JNIEnv, _obj: JObject, handle: jlong, @@ -705,7 +705,7 @@ pub extern "system" fn Java_com_lancedb_lance_namespace_RestNamespace_registerTa } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_namespace_RestNamespace_tableExistsNative( +pub extern "system" fn Java_org_lance_namespace_RestNamespace_tableExistsNative( mut env: JNIEnv, _obj: JObject, handle: jlong, @@ -720,7 +720,7 @@ pub extern "system" fn Java_com_lancedb_lance_namespace_RestNamespace_tableExist } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_namespace_RestNamespace_dropTableNative( +pub extern "system" fn Java_org_lance_namespace_RestNamespace_dropTableNative( mut env: JNIEnv, _obj: JObject, handle: jlong, @@ -737,7 +737,7 @@ pub extern "system" fn Java_com_lancedb_lance_namespace_RestNamespace_dropTableN } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_namespace_RestNamespace_deregisterTableNative( +pub extern "system" fn Java_org_lance_namespace_RestNamespace_deregisterTableNative( mut env: JNIEnv, _obj: JObject, handle: jlong, @@ -754,7 +754,7 @@ pub extern "system" fn Java_com_lancedb_lance_namespace_RestNamespace_deregister } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_namespace_RestNamespace_countTableRowsNative( +pub extern "system" fn Java_org_lance_namespace_RestNamespace_countTableRowsNative( mut env: JNIEnv, _obj: JObject, handle: jlong, @@ -768,7 +768,7 @@ pub extern "system" fn Java_com_lancedb_lance_namespace_RestNamespace_countTable } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_namespace_RestNamespace_createTableNative( +pub extern "system" fn Java_org_lance_namespace_RestNamespace_createTableNative( mut env: JNIEnv, _obj: JObject, handle: jlong, @@ -790,7 +790,7 @@ pub extern "system" fn Java_com_lancedb_lance_namespace_RestNamespace_createTabl } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_namespace_RestNamespace_createEmptyTableNative( +pub extern "system" fn Java_org_lance_namespace_RestNamespace_createEmptyTableNative( mut env: JNIEnv, _obj: JObject, handle: jlong, @@ -807,7 +807,7 @@ pub extern "system" fn Java_com_lancedb_lance_namespace_RestNamespace_createEmpt } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_namespace_RestNamespace_insertIntoTableNative( +pub extern "system" fn Java_org_lance_namespace_RestNamespace_insertIntoTableNative( mut env: JNIEnv, _obj: JObject, handle: jlong, @@ -829,7 +829,7 @@ pub extern "system" fn Java_com_lancedb_lance_namespace_RestNamespace_insertInto } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_namespace_RestNamespace_mergeInsertIntoTableNative( +pub extern "system" fn Java_org_lance_namespace_RestNamespace_mergeInsertIntoTableNative( mut env: JNIEnv, _obj: JObject, handle: jlong, @@ -851,7 +851,7 @@ pub extern "system" fn Java_com_lancedb_lance_namespace_RestNamespace_mergeInser } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_namespace_RestNamespace_updateTableNative( +pub extern "system" fn Java_org_lance_namespace_RestNamespace_updateTableNative( mut env: JNIEnv, _obj: JObject, handle: jlong, @@ -868,7 +868,7 @@ pub extern "system" fn Java_com_lancedb_lance_namespace_RestNamespace_updateTabl } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_namespace_RestNamespace_deleteFromTableNative( +pub extern "system" fn Java_org_lance_namespace_RestNamespace_deleteFromTableNative( mut env: JNIEnv, _obj: JObject, handle: jlong, @@ -885,7 +885,7 @@ pub extern "system" fn Java_com_lancedb_lance_namespace_RestNamespace_deleteFrom } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_namespace_RestNamespace_queryTableNative( +pub extern "system" fn Java_org_lance_namespace_RestNamespace_queryTableNative( mut env: JNIEnv, _obj: JObject, handle: jlong, @@ -900,7 +900,7 @@ pub extern "system" fn Java_com_lancedb_lance_namespace_RestNamespace_queryTable } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_namespace_RestNamespace_createTableIndexNative( +pub extern "system" fn Java_org_lance_namespace_RestNamespace_createTableIndexNative( mut env: JNIEnv, _obj: JObject, handle: jlong, @@ -917,7 +917,7 @@ pub extern "system" fn Java_com_lancedb_lance_namespace_RestNamespace_createTabl } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_namespace_RestNamespace_listTableIndicesNative( +pub extern "system" fn Java_org_lance_namespace_RestNamespace_listTableIndicesNative( mut env: JNIEnv, _obj: JObject, handle: jlong, @@ -934,7 +934,7 @@ pub extern "system" fn Java_com_lancedb_lance_namespace_RestNamespace_listTableI } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_namespace_RestNamespace_describeTableIndexStatsNative( +pub extern "system" fn Java_org_lance_namespace_RestNamespace_describeTableIndexStatsNative( mut env: JNIEnv, _obj: JObject, handle: jlong, @@ -951,7 +951,7 @@ pub extern "system" fn Java_com_lancedb_lance_namespace_RestNamespace_describeTa } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_namespace_RestNamespace_describeTransactionNative( +pub extern "system" fn Java_org_lance_namespace_RestNamespace_describeTransactionNative( mut env: JNIEnv, _obj: JObject, handle: jlong, @@ -968,7 +968,7 @@ pub extern "system" fn Java_com_lancedb_lance_namespace_RestNamespace_describeTr } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_namespace_RestNamespace_alterTransactionNative( +pub extern "system" fn Java_org_lance_namespace_RestNamespace_alterTransactionNative( mut env: JNIEnv, _obj: JObject, handle: jlong, @@ -1229,7 +1229,7 @@ pub struct BlockingRestAdapter { } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_namespace_RestAdapter_createNative( +pub extern "system" fn Java_org_lance_namespace_RestAdapter_createNative( mut env: JNIEnv, _obj: JObject, namespace_impl: JString, @@ -1287,7 +1287,7 @@ fn create_rest_adapter_internal( } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_namespace_RestAdapter_serve( +pub extern "system" fn Java_org_lance_namespace_RestAdapter_serve( mut env: JNIEnv, _obj: JObject, handle: jlong, @@ -1314,7 +1314,7 @@ fn serve_internal(handle: jlong) -> Result<()> { } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_namespace_RestAdapter_stop( +pub extern "system" fn Java_org_lance_namespace_RestAdapter_stop( _env: JNIEnv, _obj: JObject, handle: jlong, @@ -1327,7 +1327,7 @@ pub extern "system" fn Java_com_lancedb_lance_namespace_RestAdapter_stop( } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_namespace_RestAdapter_releaseNative( +pub extern "system" fn Java_org_lance_namespace_RestAdapter_releaseNative( _env: JNIEnv, _obj: JObject, handle: jlong, diff --git a/java/lance-jni/src/optimize.rs b/java/lance-jni/src/optimize.rs index 8a5dc1f6ba5..11a1f986e37 100644 --- a/java/lance-jni/src/optimize.rs +++ b/java/lance-jni/src/optimize.rs @@ -31,7 +31,7 @@ use crate::{ use crate::error::Result; #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_compaction_Compaction_nativePlanCompaction<'local>( +pub extern "system" fn Java_org_lance_compaction_Compaction_nativePlanCompaction<'local>( mut env: JNIEnv<'local>, _obj: JObject, java_dataset: JObject, // Dataset @@ -96,9 +96,7 @@ fn inner_plan_compaction<'local>( } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_compaction_Compaction_nativeCommitCompaction< - 'local, ->( +pub extern "system" fn Java_org_lance_compaction_Compaction_nativeCommitCompaction<'local>( mut env: JNIEnv<'local>, _obj: JObject, java_dataset: JObject, // Dataset @@ -174,7 +172,7 @@ fn inner_commit_compaction<'local>( } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_compaction_CompactionTask_nativeExecute<'local>( +pub extern "system" fn Java_org_lance_compaction_CompactionTask_nativeExecute<'local>( mut env: JNIEnv<'local>, _obj: JObject, // CompactionTask itself java_dataset: JObject, // Dataset @@ -249,16 +247,17 @@ fn inner_execute_task<'local>( rewrite_result.into_java(env) } -const TASK_DATA_CLASS: &str = "com/lancedb/lance/compaction/TaskData"; +const TASK_DATA_CLASS: &str = "org/lance/compaction/TaskData"; const TASK_DATA_CONSTRUCTOR_SIG: &str = "(Ljava/util/List;)V"; -const COMPACTION_METRICS_CLASS: &str = "com/lancedb/lance/compaction/CompactionMetrics"; +const COMPACTION_METRICS_CLASS: &str = "org/lance/compaction/CompactionMetrics"; const COMPACTION_METRICS_CONSTRUCTOR_SIG: &str = "(JJJJ)V"; -const COMPACTION_PLAN_CLASS: &str = "com/lancedb/lance/compaction/CompactionPlan"; +const COMPACTION_PLAN_CLASS: &str = "org/lance/compaction/CompactionPlan"; const COMPACTION_PLAN_CONSTRUCTOR_SIG: &str = - "(Ljava/util/List;JLcom/lancedb/lance/compaction/CompactionOptions;)V"; -const REWRITE_RESULT_CLASS: &str = "com/lancedb/lance/compaction/RewriteResult"; -const REWRITE_RESULT_CONSTRUCTOR_SIG: &str = "(Lcom/lancedb/lance/compaction/CompactionMetrics;Ljava/util/List;Ljava/util/List;JLjava/util/Map;[B)V"; -const COMPACTION_OPTIONS_CLASS: &str = "com/lancedb/lance/compaction/CompactionOptions"; + "(Ljava/util/List;JLorg/lance/compaction/CompactionOptions;)V"; +const REWRITE_RESULT_CLASS: &str = "org/lance/compaction/RewriteResult"; +const REWRITE_RESULT_CONSTRUCTOR_SIG: &str = + "(Lorg/lance/compaction/CompactionMetrics;Ljava/util/List;Ljava/util/List;JLjava/util/Map;[B)V"; +const COMPACTION_OPTIONS_CLASS: &str = "org/lance/compaction/CompactionOptions"; const COMPACTION_OPTIONS_CONSTRUCTOR_SIG: &str = "(Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V"; @@ -421,7 +420,7 @@ impl FromJObjectWithEnv for JObject<'_> { .call_method( self, "getMetrics", - "()Lcom/lancedb/lance/compaction/CompactionMetrics;", + "()Lorg/lance/compaction/CompactionMetrics;", &[], )? .l()?; diff --git a/java/lance-jni/src/schema.rs b/java/lance-jni/src/schema.rs index 41d6f78f043..b9c3d70ef83 100644 --- a/java/lance-jni/src/schema.rs +++ b/java/lance-jni/src/schema.rs @@ -25,7 +25,7 @@ impl IntoJava for Schema { } let metadata = to_java_map(env, &self.metadata)?; Ok(env.new_object( - "com/lancedb/lance/schema/LanceSchema", + "org/lance/schema/LanceSchema", "(Ljava/util/List;Ljava/util/Map;)V", &[JValue::Object(&jfield_list), JValue::Object(&metadata)], )?) @@ -46,7 +46,7 @@ pub fn convert_to_java_field<'local>( + "Ljava/util/Map;" + "Ljava/util/List;Z)V"; let field_obj = env.new_object( - "com/lancedb/lance/schema/LanceField", + "org/lance/schema/LanceField", ctor_sig.as_str(), &[ JValue::Int(lance_field.id as jint), diff --git a/java/lance-jni/src/sql.rs b/java/lance-jni/src/sql.rs index 5d37580bb9f..e667f6c7128 100644 --- a/java/lance-jni/src/sql.rs +++ b/java/lance-jni/src/sql.rs @@ -14,7 +14,7 @@ use lance::dataset::sql::SqlQueryBuilder; use lance_io::ffi::to_ffi_arrow_array_stream; #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_SqlQuery_intoBatchRecords( +pub extern "system" fn Java_org_lance_SqlQuery_intoBatchRecords( mut env: JNIEnv, _class: JClass, java_dataset: JObject, diff --git a/java/lance-jni/src/transaction.rs b/java/lance-jni/src/transaction.rs index 4f58274e311..32ffe3c99e0 100644 --- a/java/lance-jni/src/transaction.rs +++ b/java/lance-jni/src/transaction.rs @@ -33,7 +33,7 @@ impl IntoJava for &RewriteGroup { let new_fragments = export_vec(env, &self.new_fragments)?; Ok(env.new_object( - "com/lancedb/lance/operation/RewriteGroup", + "org/lance/operation/RewriteGroup", "(Ljava/util/List;Ljava/util/List;)V", &[ JValue::Object(&old_fragments), @@ -52,7 +52,7 @@ impl IntoJava for &RewrittenIndex { let new_index_details_value = env.byte_array_from_slice(&self.new_index_details.value)?; Ok(env.new_object( - "com/lancedb/lance/operation/RewrittenIndex", + "org/lance/operation/RewrittenIndex", "(Ljava/util/UUID;Ljava/util/UUID;Ljava/lang/String;[BII)V", &[ JValue::Object(&old_id), @@ -71,8 +71,8 @@ impl IntoJava for &DataReplacementGroup { let new_file = self.1.into_java(env)?; Ok(env.new_object( - "com/lancedb/lance/operation/DataReplacement$DataReplacementGroup", - "(JLcom/lancedb/lance/fragment/DataFile;)V", + "org/lance/operation/DataReplacement$DataReplacementGroup", + "(JLorg/lance/fragment/DataFile;)V", &[JValue::Long(fragment_id as i64), JValue::Object(&new_file)], )?) } @@ -152,7 +152,7 @@ impl IntoJava for &IndexMetadata { // Create IndexMetadata object Ok(env.new_object( - "com/lancedb/lance/index/Index", + "org/lance/index/Index", "(Ljava/util/UUID;Ljava/util/List;Ljava/lang/String;JLjava/util/List;[BILjava/time/Instant;Ljava/lang/Integer;)V", &[ JValue::Object(&uuid), @@ -175,7 +175,7 @@ impl IntoJava for &UpdateMode { UpdateMode::RewriteRows => "RewriteRows", UpdateMode::RewriteColumns => "RewriteColumns", }; - let update_mode_type_class = "com/lancedb/lance/operation/Update$UpdateMode"; + let update_mode_type_class = "org/lance/operation/Update$UpdateMode"; env.get_static_field( update_mode_type_class, name, @@ -302,12 +302,7 @@ impl FromJObjectWithEnv for JObject<'_> { fn extract_object(&self, env: &mut JNIEnv<'_>) -> Result { let fragment_id = env.call_method(self, "fragmentId", "()J", &[])?.j()? as u64; let new_file = env - .call_method( - self, - "replacedFile", - "()Lcom/lancedb/lance/fragment/DataFile;", - &[], - )? + .call_method(self, "replacedFile", "()Lorg/lance/fragment/DataFile;", &[])? .l()? .extract_object(env)?; @@ -364,7 +359,7 @@ impl FromJObjectWithEnv for JObject<'_> { } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_Dataset_nativeReadTransaction<'local>( +pub extern "system" fn Java_org_lance_Dataset_nativeReadTransaction<'local>( mut env: JNIEnv<'local>, java_dataset: JObject, ) -> JObject<'local> { @@ -401,8 +396,8 @@ fn convert_to_java_transaction<'local>( let operation = convert_to_java_operation(env, Some(transaction.operation))?; let java_transaction = env.new_object( - "com/lancedb/lance/Transaction", - "(Lcom/lancedb/lance/Dataset;JLjava/lang/String;Lcom/lancedb/lance/operation/Operation;Ljava/util/Map;Ljava/util/Map;)V", + "org/lance/Transaction", + "(Lorg/lance/Dataset;JLjava/lang/String;Lorg/lance/operation/Operation;Ljava/util/Map;Ljava/util/Map;)V", &[ JValue::Object(java_dataset), JValue::Long(transaction.read_version as i64), @@ -437,7 +432,7 @@ fn convert_to_java_operation_inner<'local>( let java_fragments = export_vec(env, &rust_fragments)?; Ok(env.new_object( - "com/lancedb/lance/operation/Append", + "org/lance/operation/Append", "(Ljava/util/List;)V", &[JValue::Object(&java_fragments)], )?) @@ -458,7 +453,7 @@ fn convert_to_java_operation_inner<'local>( let predicate_obj = env.new_string(&predicate)?; Ok(env.new_object( - "com/lancedb/lance/operation/Delete", + "org/lance/operation/Delete", "(Ljava/util/List;Ljava/util/List;Ljava/lang/String;)V", &[ JValue::Object(&updated_fragments_obj), @@ -481,7 +476,7 @@ fn convert_to_java_operation_inner<'local>( }; Ok(env.new_object( - "com/lancedb/lance/operation/Overwrite", + "org/lance/operation/Overwrite", "(Ljava/util/List;Lorg/apache/arrow/vector/types/pojo/Schema;Ljava/util/Map;)V", &[ JValue::Object(&java_fragments), @@ -522,7 +517,7 @@ fn convert_to_java_operation_inner<'local>( )? .l()?; Ok(env.new_object( - "com/lancedb/lance/operation/Update", + "org/lance/operation/Update", "(Ljava/util/List;Ljava/util/List;Ljava/util/List;[J[JLjava/util/Optional;)V", &[ JValue::Object(&removed_fragment_ids_obj), @@ -538,7 +533,7 @@ fn convert_to_java_operation_inner<'local>( let java_schema = convert_to_java_schema(env, schema)?; Ok(env.new_object( - "com/lancedb/lance/operation/Project", + "org/lance/operation/Project", "(Lorg/apache/arrow/vector/types/pojo/Schema;)V", &[JValue::Object(&java_schema)], )?) @@ -556,8 +551,8 @@ fn convert_to_java_operation_inner<'local>( }; Ok(env.new_object( - "com/lancedb/lance/operation/Rewrite", - "(Ljava/util/List;Ljava/util/List;Lcom/lancedb/lance/index/Index;)V", + "org/lance/operation/Rewrite", + "(Ljava/util/List;Ljava/util/List;Lorg/lance/index/Index;)V", &[ JValue::Object(&java_groups), JValue::Object(&java_indices), @@ -593,8 +588,8 @@ fn convert_to_java_operation_inner<'local>( }; let java_operation = env.new_object( - "com/lancedb/lance/operation/UpdateConfig", - "(Lcom/lancedb/lance/operation/UpdateMap;Lcom/lancedb/lance/operation/UpdateMap;Lcom/lancedb/lance/operation/UpdateMap;Ljava/util/Map;)V", + "org/lance/operation/UpdateConfig", + "(Lorg/lance/operation/UpdateMap;Lorg/lance/operation/UpdateMap;Lorg/lance/operation/UpdateMap;Ljava/util/Map;)V", &[ JValue::Object(&config_updates_obj), JValue::Object(&table_metadata_updates_obj), @@ -608,7 +603,7 @@ fn convert_to_java_operation_inner<'local>( let java_replacements = export_vec(env, &replacements)?; Ok(env.new_object( - "com/lancedb/lance/operation/DataReplacement", + "org/lance/operation/DataReplacement", "(Ljava/util/List;)V", &[JValue::Object(&java_replacements)], )?) @@ -621,7 +616,7 @@ fn convert_to_java_operation_inner<'local>( let java_schema = convert_to_java_schema(env, schema)?; Ok(env.new_object( - "com/lancedb/lance/operation/Merge", + "org/lance/operation/Merge", "(Ljava/util/List;Lorg/apache/arrow/vector/types/pojo/Schema;)V", &[ JValue::Object(&java_fragments), @@ -630,12 +625,12 @@ fn convert_to_java_operation_inner<'local>( )?) } Operation::Restore { version } => Ok(env.new_object( - "com/lancedb/lance/operation/Restore", + "org/lance/operation/Restore", "(J)V", &[JValue::Long(version as i64)], )?), Operation::ReserveFragments { num_fragments } => Ok(env.new_object( - "com/lancedb/lance/operation/ReserveFragments", + "org/lance/operation/ReserveFragments", "(I)V", &[JValue::Int(num_fragments as i32)], )?), @@ -659,7 +654,7 @@ fn convert_to_java_schema<'local>( } #[no_mangle] -pub extern "system" fn Java_com_lancedb_lance_Dataset_nativeCommitTransaction<'local>( +pub extern "system" fn Java_org_lance_Dataset_nativeCommitTransaction<'local>( mut env: JNIEnv<'local>, java_dataset: JObject, java_transaction: JObject, @@ -723,7 +718,7 @@ fn convert_to_rust_transaction( .call_method( &java_transaction, "operation", - "()Lcom/lancedb/lance/operation/Operation;", + "()Lorg/lance/operation/Operation;", &[], )? .l()?; @@ -788,7 +783,7 @@ fn convert_to_rust_operation( .call_method( java_operation, "configUpdates", - "()Lcom/lancedb/lance/operation/UpdateMap;", + "()Lorg/lance/operation/UpdateMap;", &[], )? .l()?; @@ -802,7 +797,7 @@ fn convert_to_rust_operation( .call_method( java_operation, "tableMetadataUpdates", - "()Lcom/lancedb/lance/operation/UpdateMap;", + "()Lorg/lance/operation/UpdateMap;", &[], )? .l()?; @@ -816,7 +811,7 @@ fn convert_to_rust_operation( .call_method( java_operation, "schemaMetadataUpdates", - "()Lcom/lancedb/lance/operation/UpdateMap;", + "()Lorg/lance/operation/UpdateMap;", &[], )? .l()?; @@ -1098,7 +1093,7 @@ fn export_update_map<'a>( // Create UpdateMap object let update_map_obj = env.new_object( - "com/lancedb/lance/operation/UpdateMap", + "org/lance/operation/UpdateMap", "(Ljava/util/Map;Z)V", &[ JValue::Object(&updates_map), diff --git a/java/lance-jni/src/utils.rs b/java/lance-jni/src/utils.rs index 5a1a8b95089..dc6f1e6e60f 100644 --- a/java/lance-jni/src/utils.rs +++ b/java/lance-jni/src/utils.rs @@ -234,7 +234,7 @@ pub fn get_vector_index_params( .call_method( &vector_index_params_obj, "getIvfParams", - "()Lcom/lancedb/lance/index/vector/IvfBuildParams;", + "()Lorg/lance/index/vector/IvfBuildParams;", &[], )? .l()?; diff --git a/java/pom.xml b/java/pom.xml index 19eb6dd7b11..747f4f86182 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.lancedb + org.lance lance-core Lance Core 1.0.0-beta.10 @@ -40,7 +40,7 @@ package false false - com.lancedb.lance.shaded + org.lance.shaded /* * Licensed under the Apache License, Version 2.0 (the "License"); @@ -317,7 +317,7 @@ - com.lancedb.lance,,javax,java,\# + org.lance,,javax,java,\# diff --git a/java/src/main/java/com/lancedb/lance/BlobFile.java b/java/src/main/java/org/lance/BlobFile.java similarity index 99% rename from java/src/main/java/com/lancedb/lance/BlobFile.java rename to java/src/main/java/org/lance/BlobFile.java index 430ffd0fc44..03c8408ab57 100755 --- a/java/src/main/java/com/lancedb/lance/BlobFile.java +++ b/java/src/main/java/org/lance/BlobFile.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance; +package org.lance; import java.io.Closeable; import java.io.IOException; diff --git a/java/src/main/java/com/lancedb/lance/Branch.java b/java/src/main/java/org/lance/Branch.java similarity index 98% rename from java/src/main/java/com/lancedb/lance/Branch.java rename to java/src/main/java/org/lance/Branch.java index 0ef03478897..f2a1f5b21ea 100755 --- a/java/src/main/java/com/lancedb/lance/Branch.java +++ b/java/src/main/java/org/lance/Branch.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance; +package org.lance; import com.google.common.base.MoreObjects; diff --git a/java/src/main/java/com/lancedb/lance/Dataset.java b/java/src/main/java/org/lance/Dataset.java similarity index 97% rename from java/src/main/java/com/lancedb/lance/Dataset.java rename to java/src/main/java/org/lance/Dataset.java index 9a3aa5f1fd9..21572214eda 100644 --- a/java/src/main/java/com/lancedb/lance/Dataset.java +++ b/java/src/main/java/org/lance/Dataset.java @@ -11,25 +11,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance; - -import com.lancedb.lance.cleanup.CleanupPolicy; -import com.lancedb.lance.cleanup.RemovalStats; -import com.lancedb.lance.compaction.CompactionOptions; -import com.lancedb.lance.index.IndexOptions; -import com.lancedb.lance.index.IndexParams; -import com.lancedb.lance.index.IndexType; -import com.lancedb.lance.io.StorageOptionsProvider; -import com.lancedb.lance.ipc.DataStatistics; -import com.lancedb.lance.ipc.LanceScanner; -import com.lancedb.lance.ipc.ScanOptions; -import com.lancedb.lance.merge.MergeInsertParams; -import com.lancedb.lance.merge.MergeInsertResult; -import com.lancedb.lance.operation.UpdateConfig; -import com.lancedb.lance.operation.UpdateMap; -import com.lancedb.lance.schema.ColumnAlteration; -import com.lancedb.lance.schema.LanceSchema; -import com.lancedb.lance.schema.SqlExpressions; +package org.lance; + +import org.lance.cleanup.CleanupPolicy; +import org.lance.cleanup.RemovalStats; +import org.lance.compaction.CompactionOptions; +import org.lance.index.IndexOptions; +import org.lance.index.IndexParams; +import org.lance.index.IndexType; +import org.lance.io.StorageOptionsProvider; +import org.lance.ipc.DataStatistics; +import org.lance.ipc.LanceScanner; +import org.lance.ipc.ScanOptions; +import org.lance.merge.MergeInsertParams; +import org.lance.merge.MergeInsertResult; +import org.lance.operation.UpdateConfig; +import org.lance.operation.UpdateMap; +import org.lance.schema.ColumnAlteration; +import org.lance.schema.LanceSchema; +import org.lance.schema.SqlExpressions; import org.apache.arrow.c.ArrowArrayStream; import org.apache.arrow.c.ArrowSchema; @@ -891,7 +891,7 @@ public Schema getSchema() { private native void importFfiSchema(long arrowSchemaMemoryAddress); /** - * Get the {@link com.lancedb.lance.schema.LanceSchema} of the dataset with field ids. + * Get the {@link org.lance.schema.LanceSchema} of the dataset with field ids. * * @return the LanceSchema */ @@ -905,7 +905,7 @@ public LanceSchema getLanceSchema() { private native LanceSchema nativeGetLanceSchema(); /** - * Get the {@link com.lancedb.lance.Transaction} of the dataset at the current version. + * Get the {@link org.lance.Transaction} of the dataset at the current version. * * @return the Transaction */ diff --git a/java/src/main/java/com/lancedb/lance/Fragment.java b/java/src/main/java/org/lance/Fragment.java similarity index 97% rename from java/src/main/java/com/lancedb/lance/Fragment.java rename to java/src/main/java/org/lance/Fragment.java index 6077c68a324..812fb49548c 100644 --- a/java/src/main/java/com/lancedb/lance/Fragment.java +++ b/java/src/main/java/org/lance/Fragment.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance; +package org.lance; -import com.lancedb.lance.fragment.FragmentMergeResult; -import com.lancedb.lance.fragment.FragmentUpdateResult; -import com.lancedb.lance.io.StorageOptionsProvider; -import com.lancedb.lance.ipc.LanceScanner; -import com.lancedb.lance.ipc.ScanOptions; +import org.lance.fragment.FragmentMergeResult; +import org.lance.fragment.FragmentUpdateResult; +import org.lance.io.StorageOptionsProvider; +import org.lance.ipc.LanceScanner; +import org.lance.ipc.ScanOptions; import org.apache.arrow.c.ArrowArray; import org.apache.arrow.c.ArrowArrayStream; diff --git a/java/src/main/java/com/lancedb/lance/FragmentMetadata.java b/java/src/main/java/org/lance/FragmentMetadata.java similarity index 94% rename from java/src/main/java/com/lancedb/lance/FragmentMetadata.java rename to java/src/main/java/org/lance/FragmentMetadata.java index 6dd8103d908..8bc701b6351 100644 --- a/java/src/main/java/com/lancedb/lance/FragmentMetadata.java +++ b/java/src/main/java/org/lance/FragmentMetadata.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance; +package org.lance; -import com.lancedb.lance.fragment.DataFile; -import com.lancedb.lance.fragment.DeletionFile; -import com.lancedb.lance.fragment.RowIdMeta; +import org.lance.fragment.DataFile; +import org.lance.fragment.DeletionFile; +import org.lance.fragment.RowIdMeta; import com.google.common.base.MoreObjects; diff --git a/java/src/main/java/com/lancedb/lance/FragmentOperation.java b/java/src/main/java/org/lance/FragmentOperation.java similarity index 99% rename from java/src/main/java/com/lancedb/lance/FragmentOperation.java rename to java/src/main/java/org/lance/FragmentOperation.java index 6aa11c01afd..ee0426c8449 100644 --- a/java/src/main/java/com/lancedb/lance/FragmentOperation.java +++ b/java/src/main/java/org/lance/FragmentOperation.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance; +package org.lance; import org.apache.arrow.c.ArrowSchema; import org.apache.arrow.c.Data; diff --git a/java/src/main/java/com/lancedb/lance/JniLoader.java b/java/src/main/java/org/lance/JniLoader.java similarity index 97% rename from java/src/main/java/com/lancedb/lance/JniLoader.java rename to java/src/main/java/org/lance/JniLoader.java index 8a984b9cd80..9dc2544627d 100644 --- a/java/src/main/java/com/lancedb/lance/JniLoader.java +++ b/java/src/main/java/org/lance/JniLoader.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance; +package org.lance; import io.questdb.jar.jni.JarJniLoader; diff --git a/java/src/main/java/com/lancedb/lance/LockManager.java b/java/src/main/java/org/lance/LockManager.java similarity index 98% rename from java/src/main/java/com/lancedb/lance/LockManager.java rename to java/src/main/java/org/lance/LockManager.java index 361b06d1c03..2097e6f385f 100644 --- a/java/src/main/java/com/lancedb/lance/LockManager.java +++ b/java/src/main/java/org/lance/LockManager.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance; +package org.lance; import java.util.concurrent.locks.ReentrantReadWriteLock; diff --git a/java/src/main/java/com/lancedb/lance/ManifestSummary.java b/java/src/main/java/org/lance/ManifestSummary.java similarity index 99% rename from java/src/main/java/com/lancedb/lance/ManifestSummary.java rename to java/src/main/java/org/lance/ManifestSummary.java index b039870d93f..41595dda422 100644 --- a/java/src/main/java/com/lancedb/lance/ManifestSummary.java +++ b/java/src/main/java/org/lance/ManifestSummary.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance; +package org.lance; import com.google.common.base.MoreObjects; diff --git a/java/src/main/java/com/lancedb/lance/MetadataColumns.java b/java/src/main/java/org/lance/MetadataColumns.java similarity index 96% rename from java/src/main/java/com/lancedb/lance/MetadataColumns.java rename to java/src/main/java/org/lance/MetadataColumns.java index bb0667a36ec..f9b39399070 100644 --- a/java/src/main/java/com/lancedb/lance/MetadataColumns.java +++ b/java/src/main/java/org/lance/MetadataColumns.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance; +package org.lance; public class MetadataColumns { // Column name for the meta row ID. diff --git a/java/src/main/java/com/lancedb/lance/OpenDatasetBuilder.java b/java/src/main/java/org/lance/OpenDatasetBuilder.java similarity index 98% rename from java/src/main/java/com/lancedb/lance/OpenDatasetBuilder.java rename to java/src/main/java/org/lance/OpenDatasetBuilder.java index 268f274a2f4..3154924afb9 100644 --- a/java/src/main/java/com/lancedb/lance/OpenDatasetBuilder.java +++ b/java/src/main/java/org/lance/OpenDatasetBuilder.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance; +package org.lance; + +import org.lance.namespace.LanceNamespaceStorageOptionsProvider; import com.lancedb.lance.namespace.LanceNamespace; -import com.lancedb.lance.namespace.LanceNamespaceStorageOptionsProvider; import com.lancedb.lance.namespace.model.DescribeTableRequest; import com.lancedb.lance.namespace.model.DescribeTableResponse; - import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.memory.RootAllocator; import org.apache.arrow.util.Preconditions; diff --git a/java/src/main/java/com/lancedb/lance/ReadOptions.java b/java/src/main/java/org/lance/ReadOptions.java similarity index 99% rename from java/src/main/java/com/lancedb/lance/ReadOptions.java rename to java/src/main/java/org/lance/ReadOptions.java index 03f34ee224c..9d08c834008 100644 --- a/java/src/main/java/com/lancedb/lance/ReadOptions.java +++ b/java/src/main/java/org/lance/ReadOptions.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance; +package org.lance; -import com.lancedb.lance.io.StorageOptionsProvider; +import org.lance.io.StorageOptionsProvider; import com.google.common.base.MoreObjects; diff --git a/java/src/main/java/com/lancedb/lance/Ref.java b/java/src/main/java/org/lance/Ref.java similarity index 98% rename from java/src/main/java/com/lancedb/lance/Ref.java rename to java/src/main/java/org/lance/Ref.java index a0223bd0d0c..61e282b22b5 100644 --- a/java/src/main/java/com/lancedb/lance/Ref.java +++ b/java/src/main/java/org/lance/Ref.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance; +package org.lance; import com.google.common.base.MoreObjects; diff --git a/java/src/main/java/com/lancedb/lance/RowAddress.java b/java/src/main/java/org/lance/RowAddress.java similarity index 96% rename from java/src/main/java/com/lancedb/lance/RowAddress.java rename to java/src/main/java/org/lance/RowAddress.java index 928b0932e63..ab3879d1ee7 100644 --- a/java/src/main/java/com/lancedb/lance/RowAddress.java +++ b/java/src/main/java/org/lance/RowAddress.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance; +package org.lance; public class RowAddress { diff --git a/java/src/main/java/com/lancedb/lance/SqlQuery.java b/java/src/main/java/org/lance/SqlQuery.java similarity index 98% rename from java/src/main/java/com/lancedb/lance/SqlQuery.java rename to java/src/main/java/org/lance/SqlQuery.java index f13aaafdfee..cce6d939222 100644 --- a/java/src/main/java/com/lancedb/lance/SqlQuery.java +++ b/java/src/main/java/org/lance/SqlQuery.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance; +package org.lance; import com.google.common.base.MoreObjects; import org.apache.arrow.c.ArrowArrayStream; diff --git a/java/src/main/java/com/lancedb/lance/Tag.java b/java/src/main/java/org/lance/Tag.java similarity index 98% rename from java/src/main/java/com/lancedb/lance/Tag.java rename to java/src/main/java/org/lance/Tag.java index 10395194dcf..a9c328bedbd 100644 --- a/java/src/main/java/com/lancedb/lance/Tag.java +++ b/java/src/main/java/org/lance/Tag.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance; +package org.lance; import com.google.common.base.MoreObjects; diff --git a/java/src/main/java/com/lancedb/lance/Transaction.java b/java/src/main/java/org/lance/Transaction.java similarity index 98% rename from java/src/main/java/com/lancedb/lance/Transaction.java rename to java/src/main/java/org/lance/Transaction.java index f62b7018a86..67bc5f8d93d 100644 --- a/java/src/main/java/com/lancedb/lance/Transaction.java +++ b/java/src/main/java/org/lance/Transaction.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance; +package org.lance; -import com.lancedb.lance.operation.Operation; +import org.lance.operation.Operation; import com.google.common.base.MoreObjects; import org.apache.arrow.util.Preconditions; diff --git a/java/src/main/java/com/lancedb/lance/Utils.java b/java/src/main/java/org/lance/Utils.java similarity index 98% rename from java/src/main/java/com/lancedb/lance/Utils.java rename to java/src/main/java/org/lance/Utils.java index b7db9619e70..b194b067544 100644 --- a/java/src/main/java/com/lancedb/lance/Utils.java +++ b/java/src/main/java/org/lance/Utils.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance; +package org.lance; import org.apache.arrow.c.ArrowSchema; import org.apache.arrow.c.Data; diff --git a/java/src/main/java/com/lancedb/lance/Version.java b/java/src/main/java/org/lance/Version.java similarity index 98% rename from java/src/main/java/com/lancedb/lance/Version.java rename to java/src/main/java/org/lance/Version.java index 51880dd1419..90dd415feb7 100644 --- a/java/src/main/java/com/lancedb/lance/Version.java +++ b/java/src/main/java/org/lance/Version.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance; +package org.lance; import com.google.common.base.MoreObjects; diff --git a/java/src/main/java/com/lancedb/lance/WriteDatasetBuilder.java b/java/src/main/java/org/lance/WriteDatasetBuilder.java similarity index 99% rename from java/src/main/java/com/lancedb/lance/WriteDatasetBuilder.java rename to java/src/main/java/org/lance/WriteDatasetBuilder.java index e9e7729d037..03e82c358aa 100644 --- a/java/src/main/java/com/lancedb/lance/WriteDatasetBuilder.java +++ b/java/src/main/java/org/lance/WriteDatasetBuilder.java @@ -11,16 +11,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance; +package org.lance; + +import org.lance.io.StorageOptionsProvider; +import org.lance.namespace.LanceNamespaceStorageOptionsProvider; -import com.lancedb.lance.io.StorageOptionsProvider; import com.lancedb.lance.namespace.LanceNamespace; -import com.lancedb.lance.namespace.LanceNamespaceStorageOptionsProvider; import com.lancedb.lance.namespace.model.CreateEmptyTableRequest; import com.lancedb.lance.namespace.model.CreateEmptyTableResponse; import com.lancedb.lance.namespace.model.DescribeTableRequest; import com.lancedb.lance.namespace.model.DescribeTableResponse; - import org.apache.arrow.c.ArrowArrayStream; import org.apache.arrow.c.Data; import org.apache.arrow.memory.BufferAllocator; diff --git a/java/src/main/java/com/lancedb/lance/WriteFragmentBuilder.java b/java/src/main/java/org/lance/WriteFragmentBuilder.java similarity index 99% rename from java/src/main/java/com/lancedb/lance/WriteFragmentBuilder.java rename to java/src/main/java/org/lance/WriteFragmentBuilder.java index 10b4dd6735f..76882b14a29 100644 --- a/java/src/main/java/com/lancedb/lance/WriteFragmentBuilder.java +++ b/java/src/main/java/org/lance/WriteFragmentBuilder.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance; +package org.lance; -import com.lancedb.lance.io.StorageOptionsProvider; +import org.lance.io.StorageOptionsProvider; import org.apache.arrow.c.ArrowArrayStream; import org.apache.arrow.memory.BufferAllocator; diff --git a/java/src/main/java/com/lancedb/lance/WriteParams.java b/java/src/main/java/org/lance/WriteParams.java similarity index 99% rename from java/src/main/java/com/lancedb/lance/WriteParams.java rename to java/src/main/java/org/lance/WriteParams.java index a49cc57c3a0..a0ce1c8c375 100644 --- a/java/src/main/java/com/lancedb/lance/WriteParams.java +++ b/java/src/main/java/org/lance/WriteParams.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance; +package org.lance; import com.google.common.base.MoreObjects; diff --git a/java/src/main/java/com/lancedb/lance/cleanup/CleanupPolicy.java b/java/src/main/java/org/lance/cleanup/CleanupPolicy.java similarity index 98% rename from java/src/main/java/com/lancedb/lance/cleanup/CleanupPolicy.java rename to java/src/main/java/org/lance/cleanup/CleanupPolicy.java index acdf12d465f..075fef724aa 100644 --- a/java/src/main/java/com/lancedb/lance/cleanup/CleanupPolicy.java +++ b/java/src/main/java/org/lance/cleanup/CleanupPolicy.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance.cleanup; +package org.lance.cleanup; import java.util.Optional; diff --git a/java/src/main/java/com/lancedb/lance/cleanup/RemovalStats.java b/java/src/main/java/org/lance/cleanup/RemovalStats.java similarity index 96% rename from java/src/main/java/com/lancedb/lance/cleanup/RemovalStats.java rename to java/src/main/java/org/lance/cleanup/RemovalStats.java index a48bd28d631..1d88324f907 100644 --- a/java/src/main/java/com/lancedb/lance/cleanup/RemovalStats.java +++ b/java/src/main/java/org/lance/cleanup/RemovalStats.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance.cleanup; +package org.lance.cleanup; /** Statistics returned by dataset cleanup. */ public class RemovalStats { diff --git a/java/src/main/java/com/lancedb/lance/compaction/Compaction.java b/java/src/main/java/org/lance/compaction/Compaction.java similarity index 96% rename from java/src/main/java/com/lancedb/lance/compaction/Compaction.java rename to java/src/main/java/org/lance/compaction/Compaction.java index 5d89e8b5efc..cd294428678 100644 --- a/java/src/main/java/com/lancedb/lance/compaction/Compaction.java +++ b/java/src/main/java/org/lance/compaction/Compaction.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance.compaction; +package org.lance.compaction; -import com.lancedb.lance.Dataset; -import com.lancedb.lance.JniLoader; +import org.lance.Dataset; +import org.lance.JniLoader; import com.google.common.base.Preconditions; diff --git a/java/src/main/java/com/lancedb/lance/compaction/CompactionMetrics.java b/java/src/main/java/org/lance/compaction/CompactionMetrics.java similarity index 97% rename from java/src/main/java/com/lancedb/lance/compaction/CompactionMetrics.java rename to java/src/main/java/org/lance/compaction/CompactionMetrics.java index 5a39968e3da..02ed968e310 100644 --- a/java/src/main/java/com/lancedb/lance/compaction/CompactionMetrics.java +++ b/java/src/main/java/org/lance/compaction/CompactionMetrics.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance.compaction; +package org.lance.compaction; import com.google.common.base.MoreObjects; diff --git a/java/src/main/java/com/lancedb/lance/compaction/CompactionOptions.java b/java/src/main/java/org/lance/compaction/CompactionOptions.java similarity index 99% rename from java/src/main/java/com/lancedb/lance/compaction/CompactionOptions.java rename to java/src/main/java/org/lance/compaction/CompactionOptions.java index c4902d720f3..d5db1be817c 100644 --- a/java/src/main/java/com/lancedb/lance/compaction/CompactionOptions.java +++ b/java/src/main/java/org/lance/compaction/CompactionOptions.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance.compaction; +package org.lance.compaction; import com.google.common.base.MoreObjects; diff --git a/java/src/main/java/com/lancedb/lance/compaction/CompactionPlan.java b/java/src/main/java/org/lance/compaction/CompactionPlan.java similarity index 97% rename from java/src/main/java/com/lancedb/lance/compaction/CompactionPlan.java rename to java/src/main/java/org/lance/compaction/CompactionPlan.java index 9f1f783d59d..5832b08f38f 100644 --- a/java/src/main/java/com/lancedb/lance/compaction/CompactionPlan.java +++ b/java/src/main/java/org/lance/compaction/CompactionPlan.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance.compaction; +package org.lance.compaction; import java.util.List; import java.util.stream.Collectors; diff --git a/java/src/main/java/com/lancedb/lance/compaction/CompactionTask.java b/java/src/main/java/org/lance/compaction/CompactionTask.java similarity index 97% rename from java/src/main/java/com/lancedb/lance/compaction/CompactionTask.java rename to java/src/main/java/org/lance/compaction/CompactionTask.java index de87c56cbf7..2e288baa959 100644 --- a/java/src/main/java/com/lancedb/lance/compaction/CompactionTask.java +++ b/java/src/main/java/org/lance/compaction/CompactionTask.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance.compaction; +package org.lance.compaction; -import com.lancedb.lance.Dataset; +import org.lance.Dataset; import com.google.common.base.MoreObjects; diff --git a/java/src/main/java/com/lancedb/lance/compaction/RewriteResult.java b/java/src/main/java/org/lance/compaction/RewriteResult.java similarity index 96% rename from java/src/main/java/com/lancedb/lance/compaction/RewriteResult.java rename to java/src/main/java/org/lance/compaction/RewriteResult.java index f2b5326dc0b..adba77e89da 100644 --- a/java/src/main/java/com/lancedb/lance/compaction/RewriteResult.java +++ b/java/src/main/java/org/lance/compaction/RewriteResult.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance.compaction; +package org.lance.compaction; -import com.lancedb.lance.FragmentMetadata; +import org.lance.FragmentMetadata; import javax.annotation.Nullable; diff --git a/java/src/main/java/com/lancedb/lance/compaction/TaskData.java b/java/src/main/java/org/lance/compaction/TaskData.java similarity index 91% rename from java/src/main/java/com/lancedb/lance/compaction/TaskData.java rename to java/src/main/java/org/lance/compaction/TaskData.java index 3d2de53fddf..4ec5958215c 100644 --- a/java/src/main/java/com/lancedb/lance/compaction/TaskData.java +++ b/java/src/main/java/org/lance/compaction/TaskData.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance.compaction; +package org.lance.compaction; -import com.lancedb.lance.FragmentMetadata; +import org.lance.FragmentMetadata; import java.io.Serializable; import java.util.List; diff --git a/java/src/main/java/com/lancedb/lance/file/LanceFileReader.java b/java/src/main/java/org/lance/file/LanceFileReader.java similarity index 97% rename from java/src/main/java/com/lancedb/lance/file/LanceFileReader.java rename to java/src/main/java/org/lance/file/LanceFileReader.java index 36f26a60406..9777e529f48 100644 --- a/java/src/main/java/com/lancedb/lance/file/LanceFileReader.java +++ b/java/src/main/java/org/lance/file/LanceFileReader.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance.file; +package org.lance.file; -import com.lancedb.lance.JniLoader; -import com.lancedb.lance.util.Range; +import org.lance.JniLoader; +import org.lance.util.Range; import org.apache.arrow.c.ArrowArrayStream; import org.apache.arrow.c.ArrowSchema; diff --git a/java/src/main/java/com/lancedb/lance/file/LanceFileWriter.java b/java/src/main/java/org/lance/file/LanceFileWriter.java similarity index 97% rename from java/src/main/java/com/lancedb/lance/file/LanceFileWriter.java rename to java/src/main/java/org/lance/file/LanceFileWriter.java index ed6c4166086..1ca8b47324e 100644 --- a/java/src/main/java/com/lancedb/lance/file/LanceFileWriter.java +++ b/java/src/main/java/org/lance/file/LanceFileWriter.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance.file; +package org.lance.file; -import com.lancedb.lance.JniLoader; -import com.lancedb.lance.WriteParams; +import org.lance.JniLoader; +import org.lance.WriteParams; import org.apache.arrow.c.ArrowArray; import org.apache.arrow.c.ArrowSchema; diff --git a/java/src/main/java/com/lancedb/lance/fragment/DataFile.java b/java/src/main/java/org/lance/fragment/DataFile.java similarity index 98% rename from java/src/main/java/com/lancedb/lance/fragment/DataFile.java rename to java/src/main/java/org/lance/fragment/DataFile.java index 5d9788e6b86..1120a5286c1 100644 --- a/java/src/main/java/com/lancedb/lance/fragment/DataFile.java +++ b/java/src/main/java/org/lance/fragment/DataFile.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance.fragment; +package org.lance.fragment; import com.google.common.base.MoreObjects; diff --git a/java/src/main/java/com/lancedb/lance/fragment/DeletionFile.java b/java/src/main/java/org/lance/fragment/DeletionFile.java similarity index 98% rename from java/src/main/java/com/lancedb/lance/fragment/DeletionFile.java rename to java/src/main/java/org/lance/fragment/DeletionFile.java index 5dbedc033a0..18e17140389 100644 --- a/java/src/main/java/com/lancedb/lance/fragment/DeletionFile.java +++ b/java/src/main/java/org/lance/fragment/DeletionFile.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance.fragment; +package org.lance.fragment; import com.google.common.base.MoreObjects; diff --git a/java/src/main/java/com/lancedb/lance/fragment/DeletionFileType.java b/java/src/main/java/org/lance/fragment/DeletionFileType.java similarity index 94% rename from java/src/main/java/com/lancedb/lance/fragment/DeletionFileType.java rename to java/src/main/java/org/lance/fragment/DeletionFileType.java index 552f3899105..2f22309305b 100644 --- a/java/src/main/java/com/lancedb/lance/fragment/DeletionFileType.java +++ b/java/src/main/java/org/lance/fragment/DeletionFileType.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance.fragment; +package org.lance.fragment; public enum DeletionFileType { ARRAY, diff --git a/java/src/main/java/com/lancedb/lance/fragment/FragmentMergeResult.java b/java/src/main/java/org/lance/fragment/FragmentMergeResult.java similarity index 85% rename from java/src/main/java/com/lancedb/lance/fragment/FragmentMergeResult.java rename to java/src/main/java/org/lance/fragment/FragmentMergeResult.java index 649ee4f89ae..7d22f3e1e13 100644 --- a/java/src/main/java/com/lancedb/lance/fragment/FragmentMergeResult.java +++ b/java/src/main/java/org/lance/fragment/FragmentMergeResult.java @@ -11,16 +11,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance.fragment; +package org.lance.fragment; -import com.lancedb.lance.FragmentMetadata; -import com.lancedb.lance.schema.LanceSchema; +import org.lance.FragmentMetadata; +import org.lance.schema.LanceSchema; import com.google.common.base.MoreObjects; import org.apache.arrow.c.ArrowArrayStream; /** - * Result of {@link com.lancedb.lance.Fragment#mergeColumns(ArrowArrayStream, String, String) + * Result of {@link org.lance.Fragment#mergeColumns(ArrowArrayStream, String, String) * Fragment.mergeColumns()}. */ public class FragmentMergeResult { diff --git a/java/src/main/java/com/lancedb/lance/fragment/FragmentUpdateResult.java b/java/src/main/java/org/lance/fragment/FragmentUpdateResult.java similarity index 88% rename from java/src/main/java/com/lancedb/lance/fragment/FragmentUpdateResult.java rename to java/src/main/java/org/lance/fragment/FragmentUpdateResult.java index 1769c145cd9..47718119371 100644 --- a/java/src/main/java/com/lancedb/lance/fragment/FragmentUpdateResult.java +++ b/java/src/main/java/org/lance/fragment/FragmentUpdateResult.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance.fragment; +package org.lance.fragment; -import com.lancedb.lance.FragmentMetadata; +import org.lance.FragmentMetadata; import com.google.common.base.MoreObjects; import org.apache.arrow.c.ArrowArrayStream; /** - * Result of {@link com.lancedb.lance.Fragment#updateColumns(ArrowArrayStream, String, String) + * Result of {@link org.lance.Fragment#updateColumns(ArrowArrayStream, String, String) * Fragment.updateColumns()}. */ public class FragmentUpdateResult { diff --git a/java/src/main/java/com/lancedb/lance/fragment/RowIdMeta.java b/java/src/main/java/org/lance/fragment/RowIdMeta.java similarity index 97% rename from java/src/main/java/com/lancedb/lance/fragment/RowIdMeta.java rename to java/src/main/java/org/lance/fragment/RowIdMeta.java index 69f5d8649e1..f9c2fa8b4ac 100644 --- a/java/src/main/java/com/lancedb/lance/fragment/RowIdMeta.java +++ b/java/src/main/java/org/lance/fragment/RowIdMeta.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance.fragment; +package org.lance.fragment; import com.google.common.base.MoreObjects; diff --git a/java/src/main/java/com/lancedb/lance/index/DistanceType.java b/java/src/main/java/org/lance/index/DistanceType.java similarity index 94% rename from java/src/main/java/com/lancedb/lance/index/DistanceType.java rename to java/src/main/java/org/lance/index/DistanceType.java index 61f2020e419..b9b9cd76247 100644 --- a/java/src/main/java/com/lancedb/lance/index/DistanceType.java +++ b/java/src/main/java/org/lance/index/DistanceType.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance.index; +package org.lance.index; public enum DistanceType { L2, diff --git a/java/src/main/java/com/lancedb/lance/index/Index.java b/java/src/main/java/org/lance/index/Index.java similarity index 99% rename from java/src/main/java/com/lancedb/lance/index/Index.java rename to java/src/main/java/org/lance/index/Index.java index 65617e28855..86ff8c6007b 100644 --- a/java/src/main/java/com/lancedb/lance/index/Index.java +++ b/java/src/main/java/org/lance/index/Index.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance.index; +package org.lance.index; import com.google.common.base.MoreObjects; diff --git a/java/src/main/java/com/lancedb/lance/index/IndexOptions.java b/java/src/main/java/org/lance/index/IndexOptions.java similarity index 99% rename from java/src/main/java/com/lancedb/lance/index/IndexOptions.java rename to java/src/main/java/org/lance/index/IndexOptions.java index 057734ad34d..504067cc897 100644 --- a/java/src/main/java/com/lancedb/lance/index/IndexOptions.java +++ b/java/src/main/java/org/lance/index/IndexOptions.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance.index; +package org.lance.index; import org.apache.arrow.util.Preconditions; diff --git a/java/src/main/java/com/lancedb/lance/index/IndexParams.java b/java/src/main/java/org/lance/index/IndexParams.java similarity index 94% rename from java/src/main/java/com/lancedb/lance/index/IndexParams.java rename to java/src/main/java/org/lance/index/IndexParams.java index 2166a606cfe..261057198e5 100644 --- a/java/src/main/java/com/lancedb/lance/index/IndexParams.java +++ b/java/src/main/java/org/lance/index/IndexParams.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance.index; +package org.lance.index; -import com.lancedb.lance.index.scalar.ScalarIndexParams; -import com.lancedb.lance.index.vector.VectorIndexParams; +import org.lance.index.scalar.ScalarIndexParams; +import org.lance.index.vector.VectorIndexParams; import com.google.common.base.MoreObjects; diff --git a/java/src/main/java/com/lancedb/lance/index/IndexType.java b/java/src/main/java/org/lance/index/IndexType.java similarity index 96% rename from java/src/main/java/com/lancedb/lance/index/IndexType.java rename to java/src/main/java/org/lance/index/IndexType.java index a6253be5d7a..5ea900b82d0 100644 --- a/java/src/main/java/com/lancedb/lance/index/IndexType.java +++ b/java/src/main/java/org/lance/index/IndexType.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance.index; +package org.lance.index; public enum IndexType { SCALAR(0), diff --git a/java/src/main/java/com/lancedb/lance/index/scalar/ScalarIndexParams.java b/java/src/main/java/org/lance/index/scalar/ScalarIndexParams.java similarity index 98% rename from java/src/main/java/com/lancedb/lance/index/scalar/ScalarIndexParams.java rename to java/src/main/java/org/lance/index/scalar/ScalarIndexParams.java index c4243f5fe04..345a55f20b2 100644 --- a/java/src/main/java/com/lancedb/lance/index/scalar/ScalarIndexParams.java +++ b/java/src/main/java/org/lance/index/scalar/ScalarIndexParams.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance.index.scalar; +package org.lance.index.scalar; import com.google.common.base.MoreObjects; diff --git a/java/src/main/java/com/lancedb/lance/index/vector/HnswBuildParams.java b/java/src/main/java/org/lance/index/vector/HnswBuildParams.java similarity index 98% rename from java/src/main/java/com/lancedb/lance/index/vector/HnswBuildParams.java rename to java/src/main/java/org/lance/index/vector/HnswBuildParams.java index a514420feb7..68d232bda24 100644 --- a/java/src/main/java/com/lancedb/lance/index/vector/HnswBuildParams.java +++ b/java/src/main/java/org/lance/index/vector/HnswBuildParams.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance.index.vector; +package org.lance.index.vector; import com.google.common.base.MoreObjects; diff --git a/java/src/main/java/com/lancedb/lance/index/vector/IvfBuildParams.java b/java/src/main/java/org/lance/index/vector/IvfBuildParams.java similarity index 99% rename from java/src/main/java/com/lancedb/lance/index/vector/IvfBuildParams.java rename to java/src/main/java/org/lance/index/vector/IvfBuildParams.java index 7e17e2d005c..c9a795a03cc 100644 --- a/java/src/main/java/com/lancedb/lance/index/vector/IvfBuildParams.java +++ b/java/src/main/java/org/lance/index/vector/IvfBuildParams.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance.index.vector; +package org.lance.index.vector; import com.google.common.base.MoreObjects; diff --git a/java/src/main/java/com/lancedb/lance/index/vector/PQBuildParams.java b/java/src/main/java/org/lance/index/vector/PQBuildParams.java similarity index 98% rename from java/src/main/java/com/lancedb/lance/index/vector/PQBuildParams.java rename to java/src/main/java/org/lance/index/vector/PQBuildParams.java index 8384f8cd7b5..8d076bc44fc 100644 --- a/java/src/main/java/com/lancedb/lance/index/vector/PQBuildParams.java +++ b/java/src/main/java/org/lance/index/vector/PQBuildParams.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance.index.vector; +package org.lance.index.vector; import com.google.common.base.MoreObjects; diff --git a/java/src/main/java/com/lancedb/lance/index/vector/SQBuildParams.java b/java/src/main/java/org/lance/index/vector/SQBuildParams.java similarity index 97% rename from java/src/main/java/com/lancedb/lance/index/vector/SQBuildParams.java rename to java/src/main/java/org/lance/index/vector/SQBuildParams.java index bec77e0b570..a63327d4a7f 100644 --- a/java/src/main/java/com/lancedb/lance/index/vector/SQBuildParams.java +++ b/java/src/main/java/org/lance/index/vector/SQBuildParams.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance.index.vector; +package org.lance.index.vector; import com.google.common.base.MoreObjects; diff --git a/java/src/main/java/com/lancedb/lance/index/vector/VectorIndexParams.java b/java/src/main/java/org/lance/index/vector/VectorIndexParams.java similarity index 98% rename from java/src/main/java/com/lancedb/lance/index/vector/VectorIndexParams.java rename to java/src/main/java/org/lance/index/vector/VectorIndexParams.java index 6237527a752..c80e8e053fb 100644 --- a/java/src/main/java/com/lancedb/lance/index/vector/VectorIndexParams.java +++ b/java/src/main/java/org/lance/index/vector/VectorIndexParams.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance.index.vector; +package org.lance.index.vector; -import com.lancedb.lance.index.DistanceType; +import org.lance.index.DistanceType; import com.google.common.base.MoreObjects; diff --git a/java/src/main/java/com/lancedb/lance/io/StorageOptionsProvider.java b/java/src/main/java/org/lance/io/StorageOptionsProvider.java similarity index 99% rename from java/src/main/java/com/lancedb/lance/io/StorageOptionsProvider.java rename to java/src/main/java/org/lance/io/StorageOptionsProvider.java index 6748e3afb29..3876ca1fb06 100644 --- a/java/src/main/java/com/lancedb/lance/io/StorageOptionsProvider.java +++ b/java/src/main/java/org/lance/io/StorageOptionsProvider.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance.io; +package org.lance.io; import java.util.Map; diff --git a/java/src/main/java/com/lancedb/lance/ipc/ColumnOrdering.java b/java/src/main/java/org/lance/ipc/ColumnOrdering.java similarity index 98% rename from java/src/main/java/com/lancedb/lance/ipc/ColumnOrdering.java rename to java/src/main/java/org/lance/ipc/ColumnOrdering.java index f603245fbc7..dfd25edcce0 100644 --- a/java/src/main/java/com/lancedb/lance/ipc/ColumnOrdering.java +++ b/java/src/main/java/org/lance/ipc/ColumnOrdering.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance.ipc; +package org.lance.ipc; import com.google.common.base.MoreObjects; import org.apache.arrow.util.Preconditions; diff --git a/java/src/main/java/com/lancedb/lance/ipc/DataStatistics.java b/java/src/main/java/org/lance/ipc/DataStatistics.java similarity index 97% rename from java/src/main/java/com/lancedb/lance/ipc/DataStatistics.java rename to java/src/main/java/org/lance/ipc/DataStatistics.java index 6b114091a03..06391f1cdbe 100644 --- a/java/src/main/java/com/lancedb/lance/ipc/DataStatistics.java +++ b/java/src/main/java/org/lance/ipc/DataStatistics.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance.ipc; +package org.lance.ipc; import com.google.common.base.MoreObjects; diff --git a/java/src/main/java/com/lancedb/lance/ipc/FieldStatistics.java b/java/src/main/java/org/lance/ipc/FieldStatistics.java similarity index 97% rename from java/src/main/java/com/lancedb/lance/ipc/FieldStatistics.java rename to java/src/main/java/org/lance/ipc/FieldStatistics.java index d32836e086a..8f5e626ff27 100644 --- a/java/src/main/java/com/lancedb/lance/ipc/FieldStatistics.java +++ b/java/src/main/java/org/lance/ipc/FieldStatistics.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance.ipc; +package org.lance.ipc; import com.google.common.base.MoreObjects; diff --git a/java/src/main/java/com/lancedb/lance/ipc/LanceScanner.java b/java/src/main/java/org/lance/ipc/LanceScanner.java similarity index 98% rename from java/src/main/java/com/lancedb/lance/ipc/LanceScanner.java rename to java/src/main/java/org/lance/ipc/LanceScanner.java index f87097b91b5..60a619d9063 100644 --- a/java/src/main/java/com/lancedb/lance/ipc/LanceScanner.java +++ b/java/src/main/java/org/lance/ipc/LanceScanner.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance.ipc; +package org.lance.ipc; -import com.lancedb.lance.Dataset; -import com.lancedb.lance.LockManager; +import org.lance.Dataset; +import org.lance.LockManager; import org.apache.arrow.c.ArrowArrayStream; import org.apache.arrow.c.ArrowSchema; diff --git a/java/src/main/java/com/lancedb/lance/ipc/Query.java b/java/src/main/java/org/lance/ipc/Query.java similarity index 99% rename from java/src/main/java/com/lancedb/lance/ipc/Query.java rename to java/src/main/java/org/lance/ipc/Query.java index 07b573dc494..6c51db1dde8 100644 --- a/java/src/main/java/com/lancedb/lance/ipc/Query.java +++ b/java/src/main/java/org/lance/ipc/Query.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance.ipc; +package org.lance.ipc; -import com.lancedb.lance.index.DistanceType; +import org.lance.index.DistanceType; import com.google.common.base.MoreObjects; import org.apache.arrow.util.Preconditions; diff --git a/java/src/main/java/com/lancedb/lance/ipc/ScanOptions.java b/java/src/main/java/org/lance/ipc/ScanOptions.java similarity index 99% rename from java/src/main/java/com/lancedb/lance/ipc/ScanOptions.java rename to java/src/main/java/org/lance/ipc/ScanOptions.java index da9128513d3..615a96a2bb5 100644 --- a/java/src/main/java/com/lancedb/lance/ipc/ScanOptions.java +++ b/java/src/main/java/org/lance/ipc/ScanOptions.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance.ipc; +package org.lance.ipc; import com.google.common.base.MoreObjects; import org.apache.arrow.util.Preconditions; diff --git a/java/src/main/java/com/lancedb/lance/merge/MergeInsertParams.java b/java/src/main/java/org/lance/merge/MergeInsertParams.java similarity index 99% rename from java/src/main/java/com/lancedb/lance/merge/MergeInsertParams.java rename to java/src/main/java/org/lance/merge/MergeInsertParams.java index 0550b66e68f..e27b0f7f235 100644 --- a/java/src/main/java/com/lancedb/lance/merge/MergeInsertParams.java +++ b/java/src/main/java/org/lance/merge/MergeInsertParams.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance.merge; +package org.lance.merge; import com.google.common.base.MoreObjects; import com.google.common.base.Preconditions; diff --git a/java/src/main/java/com/lancedb/lance/merge/MergeInsertResult.java b/java/src/main/java/org/lance/merge/MergeInsertResult.java similarity index 93% rename from java/src/main/java/com/lancedb/lance/merge/MergeInsertResult.java rename to java/src/main/java/org/lance/merge/MergeInsertResult.java index 8e539ac9728..75f1ab7f8f4 100644 --- a/java/src/main/java/com/lancedb/lance/merge/MergeInsertResult.java +++ b/java/src/main/java/org/lance/merge/MergeInsertResult.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance.merge; +package org.lance.merge; -import com.lancedb.lance.Dataset; +import org.lance.Dataset; public class MergeInsertResult { private final Dataset dataset; diff --git a/java/src/main/java/com/lancedb/lance/merge/MergeInsertStats.java b/java/src/main/java/org/lance/merge/MergeInsertStats.java similarity index 98% rename from java/src/main/java/com/lancedb/lance/merge/MergeInsertStats.java rename to java/src/main/java/org/lance/merge/MergeInsertStats.java index 45a47742d3b..8482b56c213 100644 --- a/java/src/main/java/com/lancedb/lance/merge/MergeInsertStats.java +++ b/java/src/main/java/org/lance/merge/MergeInsertStats.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance.merge; +package org.lance.merge; import com.google.common.base.MoreObjects; diff --git a/java/src/main/java/com/lancedb/lance/namespace/DirectoryNamespace.java b/java/src/main/java/org/lance/namespace/DirectoryNamespace.java similarity index 99% rename from java/src/main/java/com/lancedb/lance/namespace/DirectoryNamespace.java rename to java/src/main/java/org/lance/namespace/DirectoryNamespace.java index a2ed29aac5b..554e1a5c248 100644 --- a/java/src/main/java/com/lancedb/lance/namespace/DirectoryNamespace.java +++ b/java/src/main/java/org/lance/namespace/DirectoryNamespace.java @@ -11,13 +11,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance.namespace; +package org.lance.namespace; -import com.lancedb.lance.JniLoader; -import com.lancedb.lance.namespace.model.*; +import org.lance.JniLoader; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; +import com.lancedb.lance.namespace.LanceNamespace; +import com.lancedb.lance.namespace.model.*; import org.apache.arrow.memory.BufferAllocator; import java.io.Closeable; diff --git a/java/src/main/java/com/lancedb/lance/namespace/LanceNamespaceStorageOptionsProvider.java b/java/src/main/java/org/lance/namespace/LanceNamespaceStorageOptionsProvider.java similarity index 98% rename from java/src/main/java/com/lancedb/lance/namespace/LanceNamespaceStorageOptionsProvider.java rename to java/src/main/java/org/lance/namespace/LanceNamespaceStorageOptionsProvider.java index 88d0964933c..3869c8fcc08 100644 --- a/java/src/main/java/com/lancedb/lance/namespace/LanceNamespaceStorageOptionsProvider.java +++ b/java/src/main/java/org/lance/namespace/LanceNamespaceStorageOptionsProvider.java @@ -11,9 +11,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance.namespace; +package org.lance.namespace; + +import org.lance.io.StorageOptionsProvider; -import com.lancedb.lance.io.StorageOptionsProvider; import com.lancedb.lance.namespace.model.DescribeTableRequest; import com.lancedb.lance.namespace.model.DescribeTableResponse; diff --git a/java/src/main/java/com/lancedb/lance/namespace/RestAdapter.java b/java/src/main/java/org/lance/namespace/RestAdapter.java similarity index 98% rename from java/src/main/java/com/lancedb/lance/namespace/RestAdapter.java rename to java/src/main/java/org/lance/namespace/RestAdapter.java index f9d1ffac2b9..7004994c97f 100644 --- a/java/src/main/java/com/lancedb/lance/namespace/RestAdapter.java +++ b/java/src/main/java/org/lance/namespace/RestAdapter.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance.namespace; +package org.lance.namespace; -import com.lancedb.lance.JniLoader; +import org.lance.JniLoader; import java.io.Closeable; import java.util.Map; diff --git a/java/src/main/java/com/lancedb/lance/namespace/RestNamespace.java b/java/src/main/java/org/lance/namespace/RestNamespace.java similarity index 99% rename from java/src/main/java/com/lancedb/lance/namespace/RestNamespace.java rename to java/src/main/java/org/lance/namespace/RestNamespace.java index 218822ed7be..834a7a9f73b 100644 --- a/java/src/main/java/com/lancedb/lance/namespace/RestNamespace.java +++ b/java/src/main/java/org/lance/namespace/RestNamespace.java @@ -11,13 +11,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance.namespace; +package org.lance.namespace; -import com.lancedb.lance.JniLoader; -import com.lancedb.lance.namespace.model.*; +import org.lance.JniLoader; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; +import com.lancedb.lance.namespace.LanceNamespace; +import com.lancedb.lance.namespace.model.*; import org.apache.arrow.memory.BufferAllocator; import java.io.Closeable; diff --git a/java/src/main/java/com/lancedb/lance/operation/Append.java b/java/src/main/java/org/lance/operation/Append.java similarity index 95% rename from java/src/main/java/com/lancedb/lance/operation/Append.java rename to java/src/main/java/org/lance/operation/Append.java index 0b177d165d4..aeeafaf8c18 100644 --- a/java/src/main/java/com/lancedb/lance/operation/Append.java +++ b/java/src/main/java/org/lance/operation/Append.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance.operation; +package org.lance.operation; -import com.lancedb.lance.FragmentMetadata; +import org.lance.FragmentMetadata; import com.google.common.base.MoreObjects; import org.apache.arrow.util.Preconditions; diff --git a/java/src/main/java/com/lancedb/lance/operation/CreateIndex.java b/java/src/main/java/org/lance/operation/CreateIndex.java similarity index 97% rename from java/src/main/java/com/lancedb/lance/operation/CreateIndex.java rename to java/src/main/java/org/lance/operation/CreateIndex.java index 2b9ee9e13c0..faaf72fb49e 100644 --- a/java/src/main/java/com/lancedb/lance/operation/CreateIndex.java +++ b/java/src/main/java/org/lance/operation/CreateIndex.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance.operation; +package org.lance.operation; -import com.lancedb.lance.index.Index; +import org.lance.index.Index; import com.google.common.base.MoreObjects; diff --git a/java/src/main/java/com/lancedb/lance/operation/DataReplacement.java b/java/src/main/java/org/lance/operation/DataReplacement.java similarity index 98% rename from java/src/main/java/com/lancedb/lance/operation/DataReplacement.java rename to java/src/main/java/org/lance/operation/DataReplacement.java index df767021f67..42f0c12615f 100644 --- a/java/src/main/java/com/lancedb/lance/operation/DataReplacement.java +++ b/java/src/main/java/org/lance/operation/DataReplacement.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance.operation; +package org.lance.operation; -import com.lancedb.lance.fragment.DataFile; +import org.lance.fragment.DataFile; import com.google.common.base.MoreObjects; diff --git a/java/src/main/java/com/lancedb/lance/operation/Delete.java b/java/src/main/java/org/lance/operation/Delete.java similarity index 97% rename from java/src/main/java/com/lancedb/lance/operation/Delete.java rename to java/src/main/java/org/lance/operation/Delete.java index 97726e9350e..de868a5627c 100644 --- a/java/src/main/java/com/lancedb/lance/operation/Delete.java +++ b/java/src/main/java/org/lance/operation/Delete.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance.operation; +package org.lance.operation; -import com.lancedb.lance.FragmentMetadata; +import org.lance.FragmentMetadata; import com.google.common.base.MoreObjects; diff --git a/java/src/main/java/com/lancedb/lance/operation/Merge.java b/java/src/main/java/org/lance/operation/Merge.java similarity index 96% rename from java/src/main/java/com/lancedb/lance/operation/Merge.java rename to java/src/main/java/org/lance/operation/Merge.java index f801b2bf480..bd83657384b 100644 --- a/java/src/main/java/com/lancedb/lance/operation/Merge.java +++ b/java/src/main/java/org/lance/operation/Merge.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance.operation; +package org.lance.operation; -import com.lancedb.lance.FragmentMetadata; +import org.lance.FragmentMetadata; import com.google.common.base.MoreObjects; import org.apache.arrow.vector.types.pojo.Schema; diff --git a/java/src/main/java/com/lancedb/lance/operation/Operation.java b/java/src/main/java/org/lance/operation/Operation.java similarity index 95% rename from java/src/main/java/com/lancedb/lance/operation/Operation.java rename to java/src/main/java/org/lance/operation/Operation.java index 23f2f43e375..b497d817b61 100644 --- a/java/src/main/java/com/lancedb/lance/operation/Operation.java +++ b/java/src/main/java/org/lance/operation/Operation.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance.operation; +package org.lance.operation; /** Operation interface. */ public interface Operation { diff --git a/java/src/main/java/com/lancedb/lance/operation/Overwrite.java b/java/src/main/java/org/lance/operation/Overwrite.java similarity index 94% rename from java/src/main/java/com/lancedb/lance/operation/Overwrite.java rename to java/src/main/java/org/lance/operation/Overwrite.java index f3b9c1f1292..5459e9b33af 100644 --- a/java/src/main/java/com/lancedb/lance/operation/Overwrite.java +++ b/java/src/main/java/org/lance/operation/Overwrite.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance.operation; +package org.lance.operation; -import com.lancedb.lance.FragmentMetadata; +import org.lance.FragmentMetadata; import com.google.common.base.MoreObjects; import org.apache.arrow.vector.types.pojo.Schema; @@ -26,7 +26,7 @@ /** * Overwrite the dataset with new fragments. This operation will overwrite the existing dataset. * Note: 1. The operation won't delete table config keys which do not exist in configUpsertValues. - * 2. If we want to create a new Dataset, use {@link com.lancedb.lance.Dataset}.create instead. + * 2. If we want to create a new Dataset, use {@link org.lance.Dataset}.create instead. */ public class Overwrite extends SchemaOperation { private final List fragments; diff --git a/java/src/main/java/com/lancedb/lance/operation/Project.java b/java/src/main/java/org/lance/operation/Project.java similarity index 97% rename from java/src/main/java/com/lancedb/lance/operation/Project.java rename to java/src/main/java/org/lance/operation/Project.java index c5d2c0fe4d1..a4c718c4c4b 100644 --- a/java/src/main/java/com/lancedb/lance/operation/Project.java +++ b/java/src/main/java/org/lance/operation/Project.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance.operation; +package org.lance.operation; import com.google.common.base.MoreObjects; import org.apache.arrow.vector.types.pojo.Schema; diff --git a/java/src/main/java/com/lancedb/lance/operation/ReserveFragments.java b/java/src/main/java/org/lance/operation/ReserveFragments.java similarity index 98% rename from java/src/main/java/com/lancedb/lance/operation/ReserveFragments.java rename to java/src/main/java/org/lance/operation/ReserveFragments.java index 8c66bfe7b45..9aa82cbf58e 100644 --- a/java/src/main/java/com/lancedb/lance/operation/ReserveFragments.java +++ b/java/src/main/java/org/lance/operation/ReserveFragments.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance.operation; +package org.lance.operation; import com.google.common.base.MoreObjects; diff --git a/java/src/main/java/com/lancedb/lance/operation/Restore.java b/java/src/main/java/org/lance/operation/Restore.java similarity index 97% rename from java/src/main/java/com/lancedb/lance/operation/Restore.java rename to java/src/main/java/org/lance/operation/Restore.java index fdfc794810f..f76e9ddb981 100644 --- a/java/src/main/java/com/lancedb/lance/operation/Restore.java +++ b/java/src/main/java/org/lance/operation/Restore.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance.operation; +package org.lance.operation; import com.google.common.base.MoreObjects; diff --git a/java/src/main/java/com/lancedb/lance/operation/Rewrite.java b/java/src/main/java/org/lance/operation/Rewrite.java similarity index 98% rename from java/src/main/java/com/lancedb/lance/operation/Rewrite.java rename to java/src/main/java/org/lance/operation/Rewrite.java index 67e2a3b1a2c..044189fe6ee 100644 --- a/java/src/main/java/com/lancedb/lance/operation/Rewrite.java +++ b/java/src/main/java/org/lance/operation/Rewrite.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance.operation; +package org.lance.operation; -import com.lancedb.lance.index.Index; +import org.lance.index.Index; import com.google.common.base.MoreObjects; diff --git a/java/src/main/java/com/lancedb/lance/operation/RewriteGroup.java b/java/src/main/java/org/lance/operation/RewriteGroup.java similarity index 96% rename from java/src/main/java/com/lancedb/lance/operation/RewriteGroup.java rename to java/src/main/java/org/lance/operation/RewriteGroup.java index 3219bda3985..284bce539b5 100644 --- a/java/src/main/java/com/lancedb/lance/operation/RewriteGroup.java +++ b/java/src/main/java/org/lance/operation/RewriteGroup.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance.operation; +package org.lance.operation; -import com.lancedb.lance.FragmentMetadata; +import org.lance.FragmentMetadata; import com.google.common.base.MoreObjects; diff --git a/java/src/main/java/com/lancedb/lance/operation/RewrittenIndex.java b/java/src/main/java/org/lance/operation/RewrittenIndex.java similarity index 99% rename from java/src/main/java/com/lancedb/lance/operation/RewrittenIndex.java rename to java/src/main/java/org/lance/operation/RewrittenIndex.java index 23abc613fc1..2899991129a 100644 --- a/java/src/main/java/com/lancedb/lance/operation/RewrittenIndex.java +++ b/java/src/main/java/org/lance/operation/RewrittenIndex.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance.operation; +package org.lance.operation; import com.google.common.base.MoreObjects; diff --git a/java/src/main/java/com/lancedb/lance/operation/SchemaOperation.java b/java/src/main/java/org/lance/operation/SchemaOperation.java similarity index 97% rename from java/src/main/java/com/lancedb/lance/operation/SchemaOperation.java rename to java/src/main/java/org/lance/operation/SchemaOperation.java index afa46af39c4..3fbf6f502db 100644 --- a/java/src/main/java/com/lancedb/lance/operation/SchemaOperation.java +++ b/java/src/main/java/org/lance/operation/SchemaOperation.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance.operation; +package org.lance.operation; import org.apache.arrow.c.ArrowSchema; import org.apache.arrow.c.Data; diff --git a/java/src/main/java/com/lancedb/lance/operation/Update.java b/java/src/main/java/org/lance/operation/Update.java similarity index 98% rename from java/src/main/java/com/lancedb/lance/operation/Update.java rename to java/src/main/java/org/lance/operation/Update.java index d0d7c3871d1..f886942b4b9 100644 --- a/java/src/main/java/com/lancedb/lance/operation/Update.java +++ b/java/src/main/java/org/lance/operation/Update.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance.operation; +package org.lance.operation; -import com.lancedb.lance.FragmentMetadata; +import org.lance.FragmentMetadata; import com.google.common.base.MoreObjects; diff --git a/java/src/main/java/com/lancedb/lance/operation/UpdateConfig.java b/java/src/main/java/org/lance/operation/UpdateConfig.java similarity index 99% rename from java/src/main/java/com/lancedb/lance/operation/UpdateConfig.java rename to java/src/main/java/org/lance/operation/UpdateConfig.java index 63c66e874dd..594fbb8f52f 100644 --- a/java/src/main/java/com/lancedb/lance/operation/UpdateConfig.java +++ b/java/src/main/java/org/lance/operation/UpdateConfig.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance.operation; +package org.lance.operation; import com.google.common.base.MoreObjects; diff --git a/java/src/main/java/com/lancedb/lance/operation/UpdateMap.java b/java/src/main/java/org/lance/operation/UpdateMap.java similarity index 97% rename from java/src/main/java/com/lancedb/lance/operation/UpdateMap.java rename to java/src/main/java/org/lance/operation/UpdateMap.java index 27aec4d92a9..4dfb306f242 100644 --- a/java/src/main/java/com/lancedb/lance/operation/UpdateMap.java +++ b/java/src/main/java/org/lance/operation/UpdateMap.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance.operation; +package org.lance.operation; import java.util.Map; diff --git a/java/src/main/java/com/lancedb/lance/schema/ColumnAlteration.java b/java/src/main/java/org/lance/schema/ColumnAlteration.java similarity index 98% rename from java/src/main/java/com/lancedb/lance/schema/ColumnAlteration.java rename to java/src/main/java/org/lance/schema/ColumnAlteration.java index 4d6c421f584..42b7d703b6d 100644 --- a/java/src/main/java/com/lancedb/lance/schema/ColumnAlteration.java +++ b/java/src/main/java/org/lance/schema/ColumnAlteration.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance.schema; +package org.lance.schema; import com.google.common.base.MoreObjects; import org.apache.arrow.vector.types.pojo.ArrowType; diff --git a/java/src/main/java/com/lancedb/lance/schema/LanceField.java b/java/src/main/java/org/lance/schema/LanceField.java similarity index 98% rename from java/src/main/java/com/lancedb/lance/schema/LanceField.java rename to java/src/main/java/org/lance/schema/LanceField.java index 9f10e58f1aa..4ede9ccb864 100644 --- a/java/src/main/java/com/lancedb/lance/schema/LanceField.java +++ b/java/src/main/java/org/lance/schema/LanceField.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance.schema; +package org.lance.schema; import com.google.common.base.MoreObjects; import org.apache.arrow.vector.types.pojo.ArrowType; diff --git a/java/src/main/java/com/lancedb/lance/schema/LanceSchema.java b/java/src/main/java/org/lance/schema/LanceSchema.java similarity index 98% rename from java/src/main/java/com/lancedb/lance/schema/LanceSchema.java rename to java/src/main/java/org/lance/schema/LanceSchema.java index 7a29aed10f0..9df2e072b51 100644 --- a/java/src/main/java/com/lancedb/lance/schema/LanceSchema.java +++ b/java/src/main/java/org/lance/schema/LanceSchema.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance.schema; +package org.lance.schema; import com.google.common.base.MoreObjects; import org.apache.arrow.vector.types.pojo.Schema; diff --git a/java/src/main/java/com/lancedb/lance/schema/SqlExpressions.java b/java/src/main/java/org/lance/schema/SqlExpressions.java similarity index 98% rename from java/src/main/java/com/lancedb/lance/schema/SqlExpressions.java rename to java/src/main/java/org/lance/schema/SqlExpressions.java index e05ce58aa1e..26b025fc328 100644 --- a/java/src/main/java/com/lancedb/lance/schema/SqlExpressions.java +++ b/java/src/main/java/org/lance/schema/SqlExpressions.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance.schema; +package org.lance.schema; import java.util.ArrayList; import java.util.List; diff --git a/java/src/main/java/com/lancedb/lance/test/JniTestHelper.java b/java/src/main/java/org/lance/test/JniTestHelper.java similarity index 91% rename from java/src/main/java/com/lancedb/lance/test/JniTestHelper.java rename to java/src/main/java/org/lance/test/JniTestHelper.java index be92bf8f08a..21b7855a345 100644 --- a/java/src/main/java/com/lancedb/lance/test/JniTestHelper.java +++ b/java/src/main/java/org/lance/test/JniTestHelper.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance.test; +package org.lance.test; -import com.lancedb.lance.JniLoader; -import com.lancedb.lance.index.IndexParams; -import com.lancedb.lance.ipc.Query; +import org.lance.JniLoader; +import org.lance.index.IndexParams; +import org.lance.ipc.Query; import java.util.List; import java.util.Optional; diff --git a/java/src/main/java/com/lancedb/lance/util/Range.java b/java/src/main/java/org/lance/util/Range.java similarity index 96% rename from java/src/main/java/com/lancedb/lance/util/Range.java rename to java/src/main/java/org/lance/util/Range.java index 3813239d359..5661f4bc93a 100644 --- a/java/src/main/java/com/lancedb/lance/util/Range.java +++ b/java/src/main/java/org/lance/util/Range.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance.util; +package org.lance.util; /** Define a range with start (include) and end (exclude). */ public class Range { diff --git a/java/src/test/java/com/lancedb/lance/CleanupTest.java b/java/src/test/java/org/lance/CleanupTest.java similarity index 96% rename from java/src/test/java/com/lancedb/lance/CleanupTest.java rename to java/src/test/java/org/lance/CleanupTest.java index 7d9d556c4dc..56955122ca0 100644 --- a/java/src/test/java/com/lancedb/lance/CleanupTest.java +++ b/java/src/test/java/org/lance/CleanupTest.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance; +package org.lance; -import com.lancedb.lance.cleanup.CleanupPolicy; -import com.lancedb.lance.cleanup.RemovalStats; +import org.lance.cleanup.CleanupPolicy; +import org.lance.cleanup.RemovalStats; import org.apache.arrow.memory.RootAllocator; import org.junit.jupiter.api.Assertions; diff --git a/java/src/test/java/com/lancedb/lance/CompactionTest.java b/java/src/test/java/org/lance/CompactionTest.java similarity index 94% rename from java/src/test/java/com/lancedb/lance/CompactionTest.java rename to java/src/test/java/org/lance/CompactionTest.java index 673dab18479..9ac96804a61 100644 --- a/java/src/test/java/com/lancedb/lance/CompactionTest.java +++ b/java/src/test/java/org/lance/CompactionTest.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance; - -import com.lancedb.lance.compaction.Compaction; -import com.lancedb.lance.compaction.CompactionMetrics; -import com.lancedb.lance.compaction.CompactionOptions; -import com.lancedb.lance.compaction.CompactionPlan; -import com.lancedb.lance.compaction.CompactionTask; -import com.lancedb.lance.compaction.RewriteResult; +package org.lance; + +import org.lance.compaction.Compaction; +import org.lance.compaction.CompactionMetrics; +import org.lance.compaction.CompactionOptions; +import org.lance.compaction.CompactionPlan; +import org.lance.compaction.CompactionTask; +import org.lance.compaction.RewriteResult; import org.apache.arrow.memory.RootAllocator; import org.junit.jupiter.api.Test; diff --git a/java/src/test/java/com/lancedb/lance/DatasetTest.java b/java/src/test/java/org/lance/DatasetTest.java similarity index 99% rename from java/src/test/java/com/lancedb/lance/DatasetTest.java rename to java/src/test/java/org/lance/DatasetTest.java index 9b9811d6378..4b5db975827 100644 --- a/java/src/test/java/com/lancedb/lance/DatasetTest.java +++ b/java/src/test/java/org/lance/DatasetTest.java @@ -11,18 +11,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance; - -import com.lancedb.lance.compaction.CompactionOptions; -import com.lancedb.lance.ipc.LanceScanner; -import com.lancedb.lance.ipc.ScanOptions; -import com.lancedb.lance.operation.Append; -import com.lancedb.lance.operation.Overwrite; -import com.lancedb.lance.operation.UpdateConfig; -import com.lancedb.lance.operation.UpdateMap; -import com.lancedb.lance.schema.ColumnAlteration; -import com.lancedb.lance.schema.LanceField; -import com.lancedb.lance.schema.SqlExpressions; +package org.lance; + +import org.lance.compaction.CompactionOptions; +import org.lance.ipc.LanceScanner; +import org.lance.ipc.ScanOptions; +import org.lance.operation.Append; +import org.lance.operation.Overwrite; +import org.lance.operation.UpdateConfig; +import org.lance.operation.UpdateMap; +import org.lance.schema.ColumnAlteration; +import org.lance.schema.LanceField; +import org.lance.schema.SqlExpressions; import org.apache.arrow.c.ArrowArrayStream; import org.apache.arrow.c.Data; diff --git a/java/src/test/java/com/lancedb/lance/FileReaderWriterTest.java b/java/src/test/java/org/lance/FileReaderWriterTest.java similarity index 98% rename from java/src/test/java/com/lancedb/lance/FileReaderWriterTest.java rename to java/src/test/java/org/lance/FileReaderWriterTest.java index 04f570b569a..116c8689d75 100644 --- a/java/src/test/java/com/lancedb/lance/FileReaderWriterTest.java +++ b/java/src/test/java/org/lance/FileReaderWriterTest.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance; +package org.lance; -import com.lancedb.lance.file.LanceFileReader; -import com.lancedb.lance.file.LanceFileWriter; -import com.lancedb.lance.util.Range; +import org.lance.file.LanceFileReader; +import org.lance.file.LanceFileWriter; +import org.lance.util.Range; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.memory.RootAllocator; diff --git a/java/src/test/java/com/lancedb/lance/FilterTest.java b/java/src/test/java/org/lance/FilterTest.java similarity index 97% rename from java/src/test/java/com/lancedb/lance/FilterTest.java rename to java/src/test/java/org/lance/FilterTest.java index 1f1fa395f75..c693dbf7c7e 100644 --- a/java/src/test/java/com/lancedb/lance/FilterTest.java +++ b/java/src/test/java/org/lance/FilterTest.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance; +package org.lance; -import com.lancedb.lance.ipc.LanceScanner; -import com.lancedb.lance.ipc.ScanOptions; +import org.lance.ipc.LanceScanner; +import org.lance.ipc.ScanOptions; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.memory.RootAllocator; diff --git a/java/src/test/java/com/lancedb/lance/FragmentTest.java b/java/src/test/java/org/lance/FragmentTest.java similarity index 98% rename from java/src/test/java/com/lancedb/lance/FragmentTest.java rename to java/src/test/java/org/lance/FragmentTest.java index 1b96eb71252..c1e646f492b 100644 --- a/java/src/test/java/com/lancedb/lance/FragmentTest.java +++ b/java/src/test/java/org/lance/FragmentTest.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance; +package org.lance; -import com.lancedb.lance.fragment.FragmentMergeResult; -import com.lancedb.lance.ipc.LanceScanner; -import com.lancedb.lance.ipc.ScanOptions; -import com.lancedb.lance.operation.Merge; -import com.lancedb.lance.operation.Update; +import org.lance.fragment.FragmentMergeResult; +import org.lance.ipc.LanceScanner; +import org.lance.ipc.ScanOptions; +import org.lance.operation.Merge; +import org.lance.operation.Update; import org.apache.arrow.memory.RootAllocator; import org.apache.arrow.vector.UInt8Vector; diff --git a/java/src/test/java/com/lancedb/lance/JNITest.java b/java/src/test/java/org/lance/JNITest.java similarity index 91% rename from java/src/test/java/com/lancedb/lance/JNITest.java rename to java/src/test/java/org/lance/JNITest.java index 279e968163f..8bf335e2fa8 100644 --- a/java/src/test/java/com/lancedb/lance/JNITest.java +++ b/java/src/test/java/org/lance/JNITest.java @@ -11,17 +11,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance; - -import com.lancedb.lance.index.DistanceType; -import com.lancedb.lance.index.IndexParams; -import com.lancedb.lance.index.vector.HnswBuildParams; -import com.lancedb.lance.index.vector.IvfBuildParams; -import com.lancedb.lance.index.vector.PQBuildParams; -import com.lancedb.lance.index.vector.SQBuildParams; -import com.lancedb.lance.index.vector.VectorIndexParams; -import com.lancedb.lance.ipc.Query; -import com.lancedb.lance.test.JniTestHelper; +package org.lance; + +import org.lance.index.DistanceType; +import org.lance.index.IndexParams; +import org.lance.index.vector.HnswBuildParams; +import org.lance.index.vector.IvfBuildParams; +import org.lance.index.vector.PQBuildParams; +import org.lance.index.vector.SQBuildParams; +import org.lance.index.vector.VectorIndexParams; +import org.lance.ipc.Query; +import org.lance.test.JniTestHelper; import org.junit.jupiter.api.Test; diff --git a/java/src/test/java/com/lancedb/lance/MergeInsertTest.java b/java/src/test/java/org/lance/MergeInsertTest.java similarity index 98% rename from java/src/test/java/com/lancedb/lance/MergeInsertTest.java rename to java/src/test/java/org/lance/MergeInsertTest.java index ca97a79884e..825fd73e814 100644 --- a/java/src/test/java/com/lancedb/lance/MergeInsertTest.java +++ b/java/src/test/java/org/lance/MergeInsertTest.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance; +package org.lance; -import com.lancedb.lance.merge.MergeInsertParams; -import com.lancedb.lance.merge.MergeInsertResult; +import org.lance.merge.MergeInsertParams; +import org.lance.merge.MergeInsertResult; import org.apache.arrow.c.ArrowArrayStream; import org.apache.arrow.c.Data; diff --git a/java/src/test/java/com/lancedb/lance/NamespaceIntegrationTest.java b/java/src/test/java/org/lance/NamespaceIntegrationTest.java similarity index 99% rename from java/src/test/java/com/lancedb/lance/NamespaceIntegrationTest.java rename to java/src/test/java/org/lance/NamespaceIntegrationTest.java index eabdc68ca6c..744953edb76 100644 --- a/java/src/test/java/com/lancedb/lance/NamespaceIntegrationTest.java +++ b/java/src/test/java/org/lance/NamespaceIntegrationTest.java @@ -11,17 +11,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance; +package org.lance; + +import org.lance.namespace.DirectoryNamespace; +import org.lance.namespace.LanceNamespaceStorageOptionsProvider; +import org.lance.operation.Append; -import com.lancedb.lance.namespace.DirectoryNamespace; import com.lancedb.lance.namespace.LanceNamespace; -import com.lancedb.lance.namespace.LanceNamespaceStorageOptionsProvider; import com.lancedb.lance.namespace.model.CreateEmptyTableRequest; import com.lancedb.lance.namespace.model.CreateEmptyTableResponse; import com.lancedb.lance.namespace.model.DescribeTableRequest; import com.lancedb.lance.namespace.model.DescribeTableResponse; -import com.lancedb.lance.operation.Append; - import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.memory.RootAllocator; import org.apache.arrow.vector.IntVector; diff --git a/java/src/test/java/com/lancedb/lance/ScalarIndexTest.java b/java/src/test/java/org/lance/ScalarIndexTest.java similarity index 96% rename from java/src/test/java/com/lancedb/lance/ScalarIndexTest.java rename to java/src/test/java/org/lance/ScalarIndexTest.java index 7ba1d1366af..6a27a8d94c5 100644 --- a/java/src/test/java/com/lancedb/lance/ScalarIndexTest.java +++ b/java/src/test/java/org/lance/ScalarIndexTest.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance; - -import com.lancedb.lance.index.Index; -import com.lancedb.lance.index.IndexOptions; -import com.lancedb.lance.index.IndexParams; -import com.lancedb.lance.index.IndexType; -import com.lancedb.lance.index.scalar.ScalarIndexParams; -import com.lancedb.lance.operation.CreateIndex; +package org.lance; + +import org.lance.index.Index; +import org.lance.index.IndexOptions; +import org.lance.index.IndexParams; +import org.lance.index.IndexType; +import org.lance.index.scalar.ScalarIndexParams; +import org.lance.operation.CreateIndex; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.memory.RootAllocator; diff --git a/java/src/test/java/com/lancedb/lance/ScannerTest.java b/java/src/test/java/org/lance/ScannerTest.java similarity index 99% rename from java/src/test/java/com/lancedb/lance/ScannerTest.java rename to java/src/test/java/org/lance/ScannerTest.java index 3ec8d4d76cd..9fe844e9334 100644 --- a/java/src/test/java/com/lancedb/lance/ScannerTest.java +++ b/java/src/test/java/org/lance/ScannerTest.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance; +package org.lance; -import com.lancedb.lance.ipc.ColumnOrdering; -import com.lancedb.lance.ipc.LanceScanner; -import com.lancedb.lance.ipc.ScanOptions; +import org.lance.ipc.ColumnOrdering; +import org.lance.ipc.LanceScanner; +import org.lance.ipc.ScanOptions; import org.apache.arrow.dataset.scanner.Scanner; import org.apache.arrow.memory.BufferAllocator; diff --git a/java/src/test/java/com/lancedb/lance/SqlQueryTest.java b/java/src/test/java/org/lance/SqlQueryTest.java similarity index 99% rename from java/src/test/java/com/lancedb/lance/SqlQueryTest.java rename to java/src/test/java/org/lance/SqlQueryTest.java index 161cef85ede..2e3dcab9892 100644 --- a/java/src/test/java/com/lancedb/lance/SqlQueryTest.java +++ b/java/src/test/java/org/lance/SqlQueryTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance; +package org.lance; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.memory.RootAllocator; diff --git a/java/src/test/java/com/lancedb/lance/TestUtils.java b/java/src/test/java/org/lance/TestUtils.java similarity index 99% rename from java/src/test/java/com/lancedb/lance/TestUtils.java rename to java/src/test/java/org/lance/TestUtils.java index 540cef24b01..f7cd56a1b0c 100644 --- a/java/src/test/java/com/lancedb/lance/TestUtils.java +++ b/java/src/test/java/org/lance/TestUtils.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance; +package org.lance; -import com.lancedb.lance.fragment.FragmentMergeResult; -import com.lancedb.lance.fragment.FragmentUpdateResult; +import org.lance.fragment.FragmentMergeResult; +import org.lance.fragment.FragmentUpdateResult; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; @@ -727,8 +727,7 @@ public Dataset createAndAppendRows(int totalRows, int batches) { Transaction txn = ds.newTransactionBuilder() - .operation( - com.lancedb.lance.operation.Append.builder().fragments(fragments).build()) + .operation(org.lance.operation.Append.builder().fragments(fragments).build()) .build(); Dataset newDs = txn.commit(); Preconditions.checkArgument( diff --git a/java/src/test/java/com/lancedb/lance/TestVectorDataset.java b/java/src/test/java/org/lance/TestVectorDataset.java similarity index 96% rename from java/src/test/java/com/lancedb/lance/TestVectorDataset.java rename to java/src/test/java/org/lance/TestVectorDataset.java index 83b8f501535..96420902e9b 100644 --- a/java/src/test/java/com/lancedb/lance/TestVectorDataset.java +++ b/java/src/test/java/org/lance/TestVectorDataset.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance; +package org.lance; -import com.lancedb.lance.index.DistanceType; -import com.lancedb.lance.index.IndexParams; -import com.lancedb.lance.index.IndexType; -import com.lancedb.lance.index.vector.VectorIndexParams; +import org.lance.index.DistanceType; +import org.lance.index.IndexParams; +import org.lance.index.IndexType; +import org.lance.index.vector.VectorIndexParams; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.memory.RootAllocator; diff --git a/java/src/test/java/com/lancedb/lance/TransactionTest.java b/java/src/test/java/org/lance/TransactionTest.java similarity index 97% rename from java/src/test/java/com/lancedb/lance/TransactionTest.java rename to java/src/test/java/org/lance/TransactionTest.java index df3b128adc4..3d7172f29dd 100644 --- a/java/src/test/java/com/lancedb/lance/TransactionTest.java +++ b/java/src/test/java/org/lance/TransactionTest.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance; +package org.lance; -import com.lancedb.lance.operation.Append; +import org.lance.operation.Append; import org.apache.arrow.memory.RootAllocator; import org.junit.jupiter.api.Test; diff --git a/java/src/test/java/com/lancedb/lance/VectorSearchTest.java b/java/src/test/java/org/lance/VectorSearchTest.java similarity index 99% rename from java/src/test/java/com/lancedb/lance/VectorSearchTest.java rename to java/src/test/java/org/lance/VectorSearchTest.java index 2b7904471c2..6476f4277cd 100644 --- a/java/src/test/java/com/lancedb/lance/VectorSearchTest.java +++ b/java/src/test/java/org/lance/VectorSearchTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance; +package org.lance; import java.util.Optional; diff --git a/java/src/test/java/com/lancedb/lance/namespace/DirectoryNamespaceTest.java b/java/src/test/java/org/lance/namespace/DirectoryNamespaceTest.java similarity index 99% rename from java/src/test/java/com/lancedb/lance/namespace/DirectoryNamespaceTest.java rename to java/src/test/java/org/lance/namespace/DirectoryNamespaceTest.java index 2982255cbea..beec2844e13 100644 --- a/java/src/test/java/com/lancedb/lance/namespace/DirectoryNamespaceTest.java +++ b/java/src/test/java/org/lance/namespace/DirectoryNamespaceTest.java @@ -11,10 +11,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance.namespace; +package org.lance.namespace; import com.lancedb.lance.namespace.model.*; - import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.memory.RootAllocator; import org.apache.arrow.vector.IntVector; diff --git a/java/src/test/java/com/lancedb/lance/namespace/RestNamespaceTest.java b/java/src/test/java/org/lance/namespace/RestNamespaceTest.java similarity index 99% rename from java/src/test/java/com/lancedb/lance/namespace/RestNamespaceTest.java rename to java/src/test/java/org/lance/namespace/RestNamespaceTest.java index 85348dadc2a..c13d29cb833 100644 --- a/java/src/test/java/com/lancedb/lance/namespace/RestNamespaceTest.java +++ b/java/src/test/java/org/lance/namespace/RestNamespaceTest.java @@ -11,10 +11,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance.namespace; +package org.lance.namespace; import com.lancedb.lance.namespace.model.*; - import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.memory.RootAllocator; import org.apache.arrow.vector.IntVector; diff --git a/java/src/test/java/com/lancedb/lance/operation/AppendTest.java b/java/src/test/java/org/lance/operation/AppendTest.java similarity index 94% rename from java/src/test/java/com/lancedb/lance/operation/AppendTest.java rename to java/src/test/java/org/lance/operation/AppendTest.java index 6d7cf0b59a8..2575d3afd00 100644 --- a/java/src/test/java/com/lancedb/lance/operation/AppendTest.java +++ b/java/src/test/java/org/lance/operation/AppendTest.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance.operation; +package org.lance.operation; -import com.lancedb.lance.Dataset; -import com.lancedb.lance.FragmentMetadata; -import com.lancedb.lance.TestUtils; -import com.lancedb.lance.Transaction; +import org.lance.Dataset; +import org.lance.FragmentMetadata; +import org.lance.TestUtils; +import org.lance.Transaction; import org.apache.arrow.memory.RootAllocator; import org.junit.jupiter.api.Test; diff --git a/java/src/test/java/com/lancedb/lance/operation/DataReplacementTest.java b/java/src/test/java/org/lance/operation/DataReplacementTest.java similarity index 94% rename from java/src/test/java/com/lancedb/lance/operation/DataReplacementTest.java rename to java/src/test/java/org/lance/operation/DataReplacementTest.java index 7b5696726b4..6d0586cc2b1 100644 --- a/java/src/test/java/com/lancedb/lance/operation/DataReplacementTest.java +++ b/java/src/test/java/org/lance/operation/DataReplacementTest.java @@ -11,16 +11,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance.operation; - -import com.lancedb.lance.Dataset; -import com.lancedb.lance.Fragment; -import com.lancedb.lance.FragmentMetadata; -import com.lancedb.lance.TestUtils; -import com.lancedb.lance.Transaction; -import com.lancedb.lance.WriteParams; -import com.lancedb.lance.fragment.DataFile; -import com.lancedb.lance.ipc.LanceScanner; +package org.lance.operation; + +import org.lance.Dataset; +import org.lance.Fragment; +import org.lance.FragmentMetadata; +import org.lance.TestUtils; +import org.lance.Transaction; +import org.lance.WriteParams; +import org.lance.fragment.DataFile; +import org.lance.ipc.LanceScanner; import org.apache.arrow.memory.RootAllocator; import org.apache.arrow.vector.IntVector; diff --git a/java/src/test/java/com/lancedb/lance/operation/DeleteTest.java b/java/src/test/java/org/lance/operation/DeleteTest.java similarity index 93% rename from java/src/test/java/com/lancedb/lance/operation/DeleteTest.java rename to java/src/test/java/org/lance/operation/DeleteTest.java index 3906224dd2c..2151b31f9de 100644 --- a/java/src/test/java/com/lancedb/lance/operation/DeleteTest.java +++ b/java/src/test/java/org/lance/operation/DeleteTest.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance.operation; +package org.lance.operation; -import com.lancedb.lance.Dataset; -import com.lancedb.lance.FragmentMetadata; -import com.lancedb.lance.TestUtils; -import com.lancedb.lance.Transaction; +import org.lance.Dataset; +import org.lance.FragmentMetadata; +import org.lance.TestUtils; +import org.lance.Transaction; import org.apache.arrow.memory.RootAllocator; import org.junit.jupiter.api.Test; diff --git a/java/src/test/java/com/lancedb/lance/operation/MergeTest.java b/java/src/test/java/org/lance/operation/MergeTest.java similarity index 97% rename from java/src/test/java/com/lancedb/lance/operation/MergeTest.java rename to java/src/test/java/org/lance/operation/MergeTest.java index 9d8ef801d30..8268aa23071 100644 --- a/java/src/test/java/com/lancedb/lance/operation/MergeTest.java +++ b/java/src/test/java/org/lance/operation/MergeTest.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance.operation; +package org.lance.operation; -import com.lancedb.lance.Dataset; -import com.lancedb.lance.FragmentMetadata; -import com.lancedb.lance.TestUtils; -import com.lancedb.lance.Transaction; -import com.lancedb.lance.fragment.DataFile; -import com.lancedb.lance.ipc.LanceScanner; +import org.lance.Dataset; +import org.lance.FragmentMetadata; +import org.lance.TestUtils; +import org.lance.Transaction; +import org.lance.fragment.DataFile; +import org.lance.ipc.LanceScanner; import org.apache.arrow.memory.RootAllocator; import org.apache.arrow.vector.IntVector; diff --git a/java/src/test/java/com/lancedb/lance/operation/OperationTestBase.java b/java/src/test/java/org/lance/operation/OperationTestBase.java similarity index 92% rename from java/src/test/java/com/lancedb/lance/operation/OperationTestBase.java rename to java/src/test/java/org/lance/operation/OperationTestBase.java index f71f155e9b0..f89aeb6e829 100644 --- a/java/src/test/java/com/lancedb/lance/operation/OperationTestBase.java +++ b/java/src/test/java/org/lance/operation/OperationTestBase.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance.operation; +package org.lance.operation; -import com.lancedb.lance.Dataset; -import com.lancedb.lance.FragmentMetadata; -import com.lancedb.lance.TestUtils; -import com.lancedb.lance.Transaction; -import com.lancedb.lance.file.LanceFileWriter; -import com.lancedb.lance.fragment.DataFile; +import org.lance.Dataset; +import org.lance.FragmentMetadata; +import org.lance.TestUtils; +import org.lance.Transaction; +import org.lance.file.LanceFileWriter; +import org.lance.fragment.DataFile; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.VectorSchemaRoot; diff --git a/java/src/test/java/com/lancedb/lance/operation/OverwriteTest.java b/java/src/test/java/org/lance/operation/OverwriteTest.java similarity index 93% rename from java/src/test/java/com/lancedb/lance/operation/OverwriteTest.java rename to java/src/test/java/org/lance/operation/OverwriteTest.java index 83aaed4febe..f5a90de5b49 100644 --- a/java/src/test/java/com/lancedb/lance/operation/OverwriteTest.java +++ b/java/src/test/java/org/lance/operation/OverwriteTest.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance.operation; +package org.lance.operation; -import com.lancedb.lance.Dataset; -import com.lancedb.lance.Fragment; -import com.lancedb.lance.FragmentMetadata; -import com.lancedb.lance.TestUtils; -import com.lancedb.lance.Transaction; -import com.lancedb.lance.ipc.LanceScanner; +import org.lance.Dataset; +import org.lance.Fragment; +import org.lance.FragmentMetadata; +import org.lance.TestUtils; +import org.lance.Transaction; +import org.lance.ipc.LanceScanner; import org.apache.arrow.memory.RootAllocator; import org.apache.arrow.vector.types.pojo.Schema; diff --git a/java/src/test/java/com/lancedb/lance/operation/ProjectTest.java b/java/src/test/java/org/lance/operation/ProjectTest.java similarity index 94% rename from java/src/test/java/com/lancedb/lance/operation/ProjectTest.java rename to java/src/test/java/org/lance/operation/ProjectTest.java index 3a564040bdf..a8124a672ca 100644 --- a/java/src/test/java/com/lancedb/lance/operation/ProjectTest.java +++ b/java/src/test/java/org/lance/operation/ProjectTest.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance.operation; +package org.lance.operation; -import com.lancedb.lance.Dataset; -import com.lancedb.lance.TestUtils; -import com.lancedb.lance.Transaction; +import org.lance.Dataset; +import org.lance.TestUtils; +import org.lance.Transaction; import org.apache.arrow.memory.RootAllocator; import org.apache.arrow.vector.types.pojo.Field; diff --git a/java/src/test/java/com/lancedb/lance/operation/ReserveFragmentsTest.java b/java/src/test/java/org/lance/operation/ReserveFragmentsTest.java similarity index 94% rename from java/src/test/java/com/lancedb/lance/operation/ReserveFragmentsTest.java rename to java/src/test/java/org/lance/operation/ReserveFragmentsTest.java index 0ce908a55b6..14089482c08 100644 --- a/java/src/test/java/com/lancedb/lance/operation/ReserveFragmentsTest.java +++ b/java/src/test/java/org/lance/operation/ReserveFragmentsTest.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance.operation; +package org.lance.operation; -import com.lancedb.lance.Dataset; -import com.lancedb.lance.Fragment; -import com.lancedb.lance.FragmentMetadata; -import com.lancedb.lance.TestUtils; -import com.lancedb.lance.Transaction; +import org.lance.Dataset; +import org.lance.Fragment; +import org.lance.FragmentMetadata; +import org.lance.TestUtils; +import org.lance.Transaction; import org.apache.arrow.memory.RootAllocator; import org.junit.jupiter.api.Assertions; diff --git a/java/src/test/java/com/lancedb/lance/operation/RestoreTest.java b/java/src/test/java/org/lance/operation/RestoreTest.java similarity index 93% rename from java/src/test/java/com/lancedb/lance/operation/RestoreTest.java rename to java/src/test/java/org/lance/operation/RestoreTest.java index 40814cf51dd..751263f4c06 100644 --- a/java/src/test/java/com/lancedb/lance/operation/RestoreTest.java +++ b/java/src/test/java/org/lance/operation/RestoreTest.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance.operation; +package org.lance.operation; -import com.lancedb.lance.Dataset; -import com.lancedb.lance.FragmentMetadata; -import com.lancedb.lance.TestUtils; -import com.lancedb.lance.Transaction; +import org.lance.Dataset; +import org.lance.FragmentMetadata; +import org.lance.TestUtils; +import org.lance.Transaction; import org.apache.arrow.memory.RootAllocator; import org.junit.jupiter.api.Test; diff --git a/java/src/test/java/com/lancedb/lance/operation/RewriteTest.java b/java/src/test/java/org/lance/operation/RewriteTest.java similarity index 94% rename from java/src/test/java/com/lancedb/lance/operation/RewriteTest.java rename to java/src/test/java/org/lance/operation/RewriteTest.java index 09dbead2cf2..4a73e2807e8 100644 --- a/java/src/test/java/com/lancedb/lance/operation/RewriteTest.java +++ b/java/src/test/java/org/lance/operation/RewriteTest.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance.operation; +package org.lance.operation; -import com.lancedb.lance.Dataset; -import com.lancedb.lance.FragmentMetadata; -import com.lancedb.lance.TestUtils; -import com.lancedb.lance.Transaction; +import org.lance.Dataset; +import org.lance.FragmentMetadata; +import org.lance.TestUtils; +import org.lance.Transaction; import org.apache.arrow.memory.RootAllocator; import org.junit.jupiter.api.Test; diff --git a/java/src/test/java/com/lancedb/lance/operation/UpdateConfigBackwardCompatibilityTest.java b/java/src/test/java/org/lance/operation/UpdateConfigBackwardCompatibilityTest.java similarity index 99% rename from java/src/test/java/com/lancedb/lance/operation/UpdateConfigBackwardCompatibilityTest.java rename to java/src/test/java/org/lance/operation/UpdateConfigBackwardCompatibilityTest.java index d87fdef118a..a90f503d252 100644 --- a/java/src/test/java/com/lancedb/lance/operation/UpdateConfigBackwardCompatibilityTest.java +++ b/java/src/test/java/org/lance/operation/UpdateConfigBackwardCompatibilityTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance.operation; +package org.lance.operation; import org.junit.jupiter.api.Test; diff --git a/java/src/test/java/com/lancedb/lance/operation/UpdateConfigTest.java b/java/src/test/java/org/lance/operation/UpdateConfigTest.java similarity index 97% rename from java/src/test/java/com/lancedb/lance/operation/UpdateConfigTest.java rename to java/src/test/java/org/lance/operation/UpdateConfigTest.java index f03d0f41d5d..14c3ea444f0 100644 --- a/java/src/test/java/com/lancedb/lance/operation/UpdateConfigTest.java +++ b/java/src/test/java/org/lance/operation/UpdateConfigTest.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance.operation; +package org.lance.operation; -import com.lancedb.lance.Dataset; -import com.lancedb.lance.TestUtils; -import com.lancedb.lance.Transaction; +import org.lance.Dataset; +import org.lance.TestUtils; +import org.lance.Transaction; import org.apache.arrow.memory.RootAllocator; import org.junit.jupiter.api.Test; diff --git a/java/src/test/java/com/lancedb/lance/operation/UpdateTest.java b/java/src/test/java/org/lance/operation/UpdateTest.java similarity index 95% rename from java/src/test/java/com/lancedb/lance/operation/UpdateTest.java rename to java/src/test/java/org/lance/operation/UpdateTest.java index 63cb58ebaa0..0e3e2276204 100644 --- a/java/src/test/java/com/lancedb/lance/operation/UpdateTest.java +++ b/java/src/test/java/org/lance/operation/UpdateTest.java @@ -11,16 +11,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lancedb.lance.operation; +package org.lance.operation; -import com.lancedb.lance.Dataset; -import com.lancedb.lance.Fragment; -import com.lancedb.lance.FragmentMetadata; -import com.lancedb.lance.TestUtils; -import com.lancedb.lance.Transaction; -import com.lancedb.lance.fragment.FragmentUpdateResult; -import com.lancedb.lance.ipc.LanceScanner; -import com.lancedb.lance.operation.Update.UpdateMode; +import org.lance.Dataset; +import org.lance.Fragment; +import org.lance.FragmentMetadata; +import org.lance.TestUtils; +import org.lance.Transaction; +import org.lance.fragment.FragmentUpdateResult; +import org.lance.ipc.LanceScanner; +import org.lance.operation.Update.UpdateMode; import org.apache.arrow.memory.RootAllocator; import org.apache.arrow.vector.IntVector;