[GJ-104]Update the groupid to io.glutenproject (facebookincubator#103)

* Update the groupid to io.gluten * Update Gluten name and version in all pom.xml * Update gluten picture
rui-mo · Apr 8, 2022 · 987fdd7 · 987fdd7
1 parent d7cd5f9
commit 987fdd7
Show file tree

Hide file tree

Showing 147 changed files with 361 additions and 361 deletions.
diff --git a/cpp/src/jni/jni_wrapper.cc b/cpp/src/jni/jni_wrapper.cc
@@ -267,30 +267,30 @@ jint JNI_OnLoad(JavaVM* vm, void* reserved) {
       CreateGlobalClassReference(env, "Ljava/lang/IllegalArgumentException;");
 
   serializable_obj_builder_class = CreateGlobalClassReference(
-      env, "Lcom/intel/oap/vectorized/NativeSerializableObject;");
+      env, "Lio/glutenproject/vectorized/NativeSerializableObject;");
   serializable_obj_builder_constructor =
       GetMethodID(env, serializable_obj_builder_class, "<init>", "([J[I)V");
 
   byte_array_class = CreateGlobalClassReference(env, "[B");
   split_result_class =
-      CreateGlobalClassReference(env, "Lcom/intel/oap/vectorized/SplitResult;");
+      CreateGlobalClassReference(env, "Lio/glutenproject/vectorized/SplitResult;");
   split_result_constructor =
       GetMethodID(env, split_result_class, "<init>", "(JJJJJJ[J[J)V");
 
   metrics_builder_class =
-      CreateGlobalClassReference(env, "Lcom/intel/oap/vectorized/MetricsObject;");
+      CreateGlobalClassReference(env, "Lio/glutenproject/vectorized/MetricsObject;");
   metrics_builder_constructor =
       GetMethodID(env, metrics_builder_class, "<init>", "([J[J)V");
 
   serialized_record_batch_iterator_class =
-      CreateGlobalClassReference(env, "Lcom/intel/oap/execution/ColumnarNativeIterator;");
+      CreateGlobalClassReference(env, "Lio/glutenproject/execution/ColumnarNativeIterator;");
   serialized_record_batch_iterator_hasNext =
       GetMethodID(env, serialized_record_batch_iterator_class, "hasNext", "()Z");
   serialized_record_batch_iterator_next =
       GetMethodID(env, serialized_record_batch_iterator_class, "next", "()[B");
 
   native_columnar_to_row_info_class = CreateGlobalClassReference(
-      env, "Lcom/intel/oap/vectorized/NativeColumnarToRowInfo;");
+      env, "Lio/glutenproject/vectorized/NativeColumnarToRowInfo;");
   native_columnar_to_row_info_constructor =
       GetMethodID(env, native_columnar_to_row_info_class, "<init>", "(J[J[JJ)V");
 
@@ -322,7 +322,7 @@ void JNI_OnUnload(JavaVM* vm, void* reserved) {
 }
 
 JNIEXPORT void JNICALL
-Java_com_intel_oap_vectorized_ExpressionEvaluatorJniWrapper_nativeSetJavaTmpDir(
+Java_io_glutenprojet_vectorized_ExpressionEvaluatorJniWrapper_nativeSetJavaTmpDir(
     JNIEnv* env, jobject obj, jstring pathObj) {
   JNI_METHOD_START
   jboolean ifCopy;
@@ -333,19 +333,19 @@ Java_com_intel_oap_vectorized_ExpressionEvaluatorJniWrapper_nativeSetJavaTmpDir(
 }
 
 JNIEXPORT void JNICALL
-Java_com_intel_oap_vectorized_ExpressionEvaluatorJniWrapper_nativeSetBatchSize(
+Java_io_glutenproject_vectorized_ExpressionEvaluatorJniWrapper_nativeSetBatchSize(
     JNIEnv* env, jobject obj, jint batch_size) {
   setenv("NATIVESQL_BATCH_SIZE", std::to_string(batch_size).c_str(), 1);
 }
 
 JNIEXPORT void JNICALL
-Java_com_intel_oap_vectorized_ExpressionEvaluatorJniWrapper_nativeSetMetricsTime(
+Java_io_glutenproject_vectorized_ExpressionEvaluatorJniWrapper_nativeSetMetricsTime(
     JNIEnv* env, jobject obj, jboolean is_enable) {
   setenv("NATIVESQL_METRICS_TIME", (is_enable ? "true" : "false"), 1);
 }
 
 JNIEXPORT jlong JNICALL
-Java_com_intel_oap_vectorized_ExpressionEvaluatorJniWrapper_nativeCreateKernelWithIterator(
+Java_io_glutenproject_vectorized_ExpressionEvaluatorJniWrapper_nativeCreateKernelWithIterator(
     JNIEnv* env, jobject obj, jlong memory_pool_id, jbyteArray plan_arr,
     jobjectArray iter_arr) {
   JNI_METHOD_START
@@ -399,7 +399,7 @@ Java_com_intel_oap_vectorized_ExpressionEvaluatorJniWrapper_nativeCreateKernelWi
   JNI_METHOD_END(-1)
 }
 
-JNIEXPORT jboolean JNICALL Java_com_intel_oap_vectorized_BatchIterator_nativeHasNext(
+JNIEXPORT jboolean JNICALL Java_io_glutenproject_vectorized_BatchIterator_nativeHasNext(
     JNIEnv* env, jobject obj, jlong id) {
   JNI_METHOD_START
   auto iter = GetBatchIterator(env, id);
@@ -411,7 +411,7 @@ JNIEXPORT jboolean JNICALL Java_com_intel_oap_vectorized_BatchIterator_nativeHas
   JNI_METHOD_END(false)
 }
 
-JNIEXPORT jobject JNICALL Java_com_intel_oap_vectorized_BatchIterator_nativeNext(
+JNIEXPORT jobject JNICALL Java_io_glutenproject_vectorized_BatchIterator_nativeNext(
     JNIEnv* env, jobject obj, jlong id) {
   JNI_METHOD_START
   auto iter = GetBatchIterator(env, id);
@@ -423,7 +423,7 @@ JNIEXPORT jobject JNICALL Java_com_intel_oap_vectorized_BatchIterator_nativeNext
   JNI_METHOD_END(nullptr)
 }
 
-JNIEXPORT void JNICALL Java_com_intel_oap_vectorized_BatchIterator_nativeClose(
+JNIEXPORT void JNICALL Java_io_glutenproject_vectorized_BatchIterator_nativeClose(
     JNIEnv* env, jobject this_obj, jlong id) {
   JNI_METHOD_START
 #ifdef DEBUG
@@ -439,7 +439,7 @@ JNIEXPORT void JNICALL Java_com_intel_oap_vectorized_BatchIterator_nativeClose(
 }
 
 JNIEXPORT jobject JNICALL
-Java_com_intel_oap_vectorized_NativeColumnarToRowJniWrapper_nativeConvertColumnarToRow(
+Java_io_glutenproject_vectorized_NativeColumnarToRowJniWrapper_nativeConvertColumnarToRow(
     JNIEnv* env, jobject, jbyteArray schema_arr, jint num_rows, jlongArray buf_addrs,
     jlongArray buf_sizes, jlong memory_pool_id) {
   JNI_METHOD_START
@@ -510,7 +510,7 @@ Java_com_intel_oap_vectorized_NativeColumnarToRowJniWrapper_nativeConvertColumna
 }
 
 JNIEXPORT void JNICALL
-Java_com_intel_oap_vectorized_NativeColumnarToRowJniWrapper_nativeClose(
+Java_io_glutenproject_vectorized_NativeColumnarToRowJniWrapper_nativeClose(
     JNIEnv* env, jobject, jlong instance_id) {
   JNI_METHOD_START
   columnar_to_row_converter_holder_.Erase(instance_id);
@@ -519,7 +519,7 @@ Java_com_intel_oap_vectorized_NativeColumnarToRowJniWrapper_nativeClose(
 
 // Shuffle
 JNIEXPORT jlong JNICALL
-Java_com_intel_oap_vectorized_ShuffleSplitterJniWrapper_nativeMake(
+Java_io_glutenproject_vectorized_ShuffleSplitterJniWrapper_nativeMake(
     JNIEnv* env, jobject, jstring partitioning_name_jstr, jint num_partitions,
     jbyteArray schema_arr, jbyteArray expr_arr, jlong offheap_per_task, jint buffer_size,
     jstring compression_type_jstr, jint batch_compress_threshold, jstring data_file_jstr,
@@ -625,7 +625,7 @@ Java_com_intel_oap_vectorized_ShuffleSplitterJniWrapper_nativeMake(
 }
 
 JNIEXPORT void JNICALL
-Java_com_intel_oap_vectorized_ShuffleSplitterJniWrapper_setCompressType(
+Java_io_glutenproject_vectorized_ShuffleSplitterJniWrapper_setCompressType(
     JNIEnv* env, jobject, jlong splitter_id, jstring compression_type_jstr) {
   JNI_METHOD_START
   auto splitter = shuffle_splitter_holder_.Lookup(splitter_id);
@@ -644,7 +644,7 @@ Java_com_intel_oap_vectorized_ShuffleSplitterJniWrapper_setCompressType(
   JNI_METHOD_END()
 }
 
-JNIEXPORT jlong JNICALL Java_com_intel_oap_vectorized_ShuffleSplitterJniWrapper_split(
+JNIEXPORT jlong JNICALL Java_io_glutenproject_vectorized_ShuffleSplitterJniWrapper_split(
     JNIEnv* env, jobject, jlong splitter_id, jint num_rows, jlongArray buf_addrs,
     jlongArray buf_sizes, jboolean first_record_batch) {
   JNI_METHOD_START
@@ -685,7 +685,7 @@ JNIEXPORT jlong JNICALL Java_com_intel_oap_vectorized_ShuffleSplitterJniWrapper_
   JNI_METHOD_END(-1L)
 }
 
-JNIEXPORT jobject JNICALL Java_com_intel_oap_vectorized_ShuffleSplitterJniWrapper_stop(
+JNIEXPORT jobject JNICALL Java_io_glutenproject_vectorized_ShuffleSplitterJniWrapper_stop(
     JNIEnv* env, jobject, jlong splitter_id) {
   JNI_METHOD_START
   auto splitter = shuffle_splitter_holder_.Lookup(splitter_id);
@@ -717,14 +717,14 @@ JNIEXPORT jobject JNICALL Java_com_intel_oap_vectorized_ShuffleSplitterJniWrappe
   JNI_METHOD_END(nullptr)
 }
 
-JNIEXPORT void JNICALL Java_com_intel_oap_vectorized_ShuffleSplitterJniWrapper_close(
+JNIEXPORT void JNICALL Java_io_glutenproject_vectorized_ShuffleSplitterJniWrapper_close(
     JNIEnv* env, jobject, jlong splitter_id) {
   JNI_METHOD_START
   shuffle_splitter_holder_.Erase(splitter_id);
   JNI_METHOD_END()
 }
 
-JNIEXPORT jlong JNICALL Java_com_intel_oap_vectorized_ShuffleDecompressionJniWrapper_make(
+JNIEXPORT jlong JNICALL Java_io_glutenproject_vectorized_ShuffleDecompressionJniWrapper_make(
     JNIEnv* env, jobject, jbyteArray schema_arr) {
   JNI_METHOD_START
   std::shared_ptr<arrow::Schema> schema;
@@ -736,7 +736,7 @@ JNIEXPORT jlong JNICALL Java_com_intel_oap_vectorized_ShuffleDecompressionJniWra
 }
 
 JNIEXPORT jobject JNICALL
-Java_com_intel_oap_vectorized_ShuffleDecompressionJniWrapper_decompress(
+Java_io_glutenproject_vectorized_ShuffleDecompressionJniWrapper_decompress(
     JNIEnv* env, jobject obj, jlong schema_holder_id, jstring compression_type_jstr,
     jint num_rows, jlongArray buf_addrs, jlongArray buf_sizes, jlongArray buf_mask) {
   JNI_METHOD_START
@@ -807,19 +807,19 @@ Java_com_intel_oap_vectorized_ShuffleDecompressionJniWrapper_decompress(
   JNI_METHOD_END(nullptr)
 }
 
-JNIEXPORT void JNICALL Java_com_intel_oap_vectorized_ShuffleDecompressionJniWrapper_close(
+JNIEXPORT void JNICALL Java_io_glutenproject_vectorized_ShuffleDecompressionJniWrapper_close(
     JNIEnv* env, jobject, jlong schema_holder_id) {
   decompression_schema_holder_.Erase(schema_holder_id);
 }
 
-JNIEXPORT void JNICALL Java_com_intel_oap_tpc_MallocUtils_mallocTrim(JNIEnv* env,
+JNIEXPORT void JNICALL Java_io_glutenproject_tpc_MallocUtils_mallocTrim(JNIEnv* env,
                                                                      jobject obj) {
   //  malloc_stats_print(statsPrint, nullptr, nullptr);
   std::cout << "Calling malloc_trim... " << std::endl;
   malloc_trim(0);
 }
 
-JNIEXPORT void JNICALL Java_com_intel_oap_tpc_MallocUtils_mallocStats(JNIEnv* env,
+JNIEXPORT void JNICALL Java_io_glutenproject_tpc_MallocUtils_mallocStats(JNIEnv* env,
                                                                       jobject obj) {
   //  malloc_stats_print(statsPrint, nullptr, nullptr);
   std::cout << "Calling malloc_stats... " << std::endl;

diff --git a/docs/image/gluten.png b/docs/image/gluten.png
diff --git a/jvm/pom.xml b/jvm/pom.xml
@@ -15,16 +15,16 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>com.intel.oap</groupId>
-    <artifactId>gazelle-jni-parent</artifactId>
-    <version>1.2.0-snapshot</version>
+    <groupId>io.glutenproject</groupId>
+    <artifactId>gluten-parent</artifactId>
+    <version>1.0.0-snapshot</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
-  <artifactId>gazelle-jni-jvm</artifactId>
-  <version>1.2.0-snapshot</version>
+  <artifactId>gluten-jvm</artifactId>
+  <version>1.0.0-snapshot</version>
   <packaging>jar</packaging>
-  <name>Gazelle Jni</name>
+  <name>Gluten</name>
 
   <properties>
     <cpp.dir>../cpp/</cpp.dir>
@@ -311,7 +311,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.intel.oap</groupId>
+      <groupId>io.glutenproject</groupId>
       <artifactId>spark-sql-columnar-shims-common</artifactId>
       <version>${project.version}</version>
       <scope>compile</scope>

diff --git a/...oap/execution/ColumnarNativeIterator.java → ...ect/execution/ColumnarNativeIterator.java b/...oap/execution/ColumnarNativeIterator.java → ...ect/execution/ColumnarNativeIterator.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package com.intel.oap.execution;
+package io.glutenproject.execution;
 
-import com.intel.oap.expression.ConverterUtils;
+import io.glutenproject.expression.ConverterUtils;
 import org.apache.arrow.dataset.jni.UnsafeRecordBatchSerializer;
 import org.apache.arrow.vector.ipc.message.ArrowRecordBatch;
 import org.apache.spark.sql.vectorized.ColumnarBatch;

diff --git a/...el/oap/expression/ArrowColumnarBatch.java → ...roject/expression/ArrowColumnarBatch.java b/...el/oap/expression/ArrowColumnarBatch.java → ...roject/expression/ArrowColumnarBatch.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.intel.oap.expression;
+package io.glutenproject.expression;
 
 import java.io.*;
 import org.apache.arrow.memory.ArrowBuf;

diff --git a/...n/java/com/intel/oap/row/RowIterator.java → ...ava/io/glutenproject/row/RowIterator.java b/...n/java/com/intel/oap/row/RowIterator.java → ...ava/io/glutenproject/row/RowIterator.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package com.intel.oap.row;
+package io.glutenproject.row;
 
-import com.intel.oap.vectorized.MetricsObject;
+import io.glutenproject.vectorized.MetricsObject;
 
 import java.io.IOException;
 

diff --git a/.../java/com/intel/oap/row/SparkRowInfo.java → ...va/io/glutenproject/row/SparkRowInfo.java b/.../java/com/intel/oap/row/SparkRowInfo.java → ...va/io/glutenproject/row/SparkRowInfo.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.intel.oap.row;
+package io.glutenproject.row;
 
 public class SparkRowInfo {
     public long[] offsets;

diff --git a/...ces/v2/arrow/NativeSQLMemoryConsumer.java → ...ces/v2/arrow/NativeSQLMemoryConsumer.java b/...ces/v2/arrow/NativeSQLMemoryConsumer.java → ...ces/v2/arrow/NativeSQLMemoryConsumer.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.intel.oap.spark.sql.execution.datasources.v2.arrow;
+package io.glutenproject.spark.sql.execution.datasources.v2.arrow;
 
 import org.apache.arrow.memory.OutOfMemoryException;
 import org.apache.spark.memory.MemoryConsumer;

diff --git a/...rces/v2/arrow/NativeSQLMemoryMetrics.java → ...rces/v2/arrow/NativeSQLMemoryMetrics.java b/...rces/v2/arrow/NativeSQLMemoryMetrics.java → ...rces/v2/arrow/NativeSQLMemoryMetrics.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.intel.oap.spark.sql.execution.datasources.v2.arrow;
+package io.glutenproject.spark.sql.execution.datasources.v2.arrow;
 
 import java.util.concurrent.atomic.AtomicLong;
 

diff --git a/...arrow/SparkManagedAllocationListener.java → ...arrow/SparkManagedAllocationListener.java b/...arrow/SparkManagedAllocationListener.java → ...arrow/SparkManagedAllocationListener.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.intel.oap.spark.sql.execution.datasources.v2.arrow;
+package io.glutenproject.spark.sql.execution.datasources.v2.arrow;
 
 import org.apache.arrow.memory.AllocationListener;
 

diff --git a/...rrow/SparkManagedReservationListener.java → ...rrow/SparkManagedReservationListener.java b/...rrow/SparkManagedReservationListener.java → ...rrow/SparkManagedReservationListener.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.intel.oap.spark.sql.execution.datasources.v2.arrow;
+package io.glutenproject.spark.sql.execution.datasources.v2.arrow;
 
 import org.apache.arrow.dataset.jni.ReservationListener;
 

diff --git a/...ecution/datasources/v2/arrow/Spiller.java → ...ecution/datasources/v2/arrow/Spiller.java b/...ecution/datasources/v2/arrow/Spiller.java → ...ecution/datasources/v2/arrow/Spiller.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.intel.oap.spark.sql.execution.datasources.v2.arrow;
+package io.glutenproject.spark.sql.execution.datasources.v2.arrow;
 
 import org.apache.spark.memory.MemoryConsumer;
 

diff --git a/...ap/substrait/derivation/BinaryOPNode.java → ...ct/substrait/derivation/BinaryOPNode.java b/...ap/substrait/derivation/BinaryOPNode.java → ...ct/substrait/derivation/BinaryOPNode.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.intel.oap.substrait.derivation;
+package io.glutenproject.substrait.derivation;
 
 import io.substrait.proto.DerivationExpression;
 
@@ -56,4 +56,4 @@ public DerivationExpression toProtobuf() {
         builder.setBinaryOp(binaryBuilder.build());
         return builder.build();
     }
-}
+}
diff --git a/...rivation/DerivationExpressionBuilder.java → ...rivation/DerivationExpressionBuilder.java b/...rivation/DerivationExpressionBuilder.java → ...rivation/DerivationExpressionBuilder.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.intel.oap.substrait.derivation;
+package io.glutenproject.substrait.derivation;
 
 public class DerivationExpressionBuilder {
     private DerivationExpressionBuilder() {}

diff --git a/.../derivation/DerivationExpressionNode.java → .../derivation/DerivationExpressionNode.java b/.../derivation/DerivationExpressionNode.java → .../derivation/DerivationExpressionNode.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.intel.oap.substrait.derivation;
+package io.glutenproject.substrait.derivation;
 
 import io.substrait.proto.DerivationExpression;
 

diff --git a/...it/derivation/DerivationFP64TypeNode.java → ...it/derivation/DerivationFP64TypeNode.java b/...it/derivation/DerivationFP64TypeNode.java → ...it/derivation/DerivationFP64TypeNode.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.intel.oap.substrait.derivation;
+package io.glutenproject.substrait.derivation;
 
 import io.substrait.proto.DerivationExpression;
 import io.substrait.proto.Type;

diff --git a/...ait/expression/AggregateFunctionNode.java → ...ait/expression/AggregateFunctionNode.java b/...ait/expression/AggregateFunctionNode.java → ...ait/expression/AggregateFunctionNode.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package com.intel.oap.substrait.expression;
+package io.glutenproject.substrait.expression;
 
-import com.intel.oap.substrait.type.TypeNode;
+import io.glutenproject.substrait.type.TypeNode;
 import io.substrait.proto.AggregateFunction;
 import io.substrait.proto.AggregationPhase;
 

diff --git a/...substrait/expression/DateLiteralNode.java → ...substrait/expression/DateLiteralNode.java b/...substrait/expression/DateLiteralNode.java → ...substrait/expression/DateLiteralNode.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.intel.oap.substrait.expression;
+package io.glutenproject.substrait.expression;
 
 import io.substrait.proto.Expression;
 

diff --git a/...bstrait/expression/DoubleLiteralNode.java → ...bstrait/expression/DoubleLiteralNode.java b/...bstrait/expression/DoubleLiteralNode.java → ...bstrait/expression/DoubleLiteralNode.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.intel.oap.substrait.expression;
+package io.glutenproject.substrait.expression;
 
 import io.substrait.proto.Expression;