Skip to content

Commit a4bb10e

Browse files
author
Wang, Gang(Gary)
committed
MNEMONIC-330: Refactor service package name
1 parent cda2b43 commit a4bb10e

File tree

62 files changed

+308
-278
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+308
-278
lines changed

‎mnemonic-benches/mnemonic-sort-bench/src/main/java/org/apache/mnemonic/bench/DNCSTextFileSort.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,22 @@
1717

1818
package org.apache.mnemonic.bench;
1919

20+
import org.apache.mnemonic.DurableType;
21+
import org.apache.mnemonic.EntityFactoryProxy;
22+
import org.apache.mnemonic.Utils;
23+
import org.apache.mnemonic.VolatileMemAllocator;
24+
import org.apache.mnemonic.collections.DurableSinglyLinkedList;
25+
import org.apache.mnemonic.collections.DurableSinglyLinkedListFactory;
26+
import org.apache.mnemonic.service.computing.GeneralComputingService;
27+
import org.apache.mnemonic.service.computing.ValueInfo;
28+
2029
import java.io.BufferedReader;
2130
import java.io.BufferedWriter;
2231
import java.io.IOException;
2332
import java.util.ArrayList;
2433
import java.util.Iterator;
2534
import java.util.List;
2635

27-
import org.apache.mnemonic.VolatileMemAllocator;
28-
import org.apache.mnemonic.EntityFactoryProxy;
29-
import org.apache.mnemonic.Utils;
30-
import org.apache.mnemonic.DurableType;
31-
import org.apache.mnemonic.collections.DurableSinglyLinkedList;
32-
import org.apache.mnemonic.collections.DurableSinglyLinkedListFactory;
33-
import org.apache.mnemonic.service.computingservice.GeneralComputingService;
34-
import org.apache.mnemonic.service.computingservice.ValueInfo;
35-
3636
public class DNCSTextFileSort implements TextFileSort {
3737
private String uri = "";
3838
private VolatileMemAllocator m_act = null;

‎mnemonic-computing-services/mnemonic-utilities-service/src/main/java/org/apache/mnemonic/service/computingservice/internal/PrintServiceImpl.java‎ renamed to ‎mnemonic-computing-services/mnemonic-utilities-service/src/main/java/org/apache/mnemonic/service/computing/internal/PrintServiceImpl.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
* limitations under the License.
1616
*/
1717

18-
package org.apache.mnemonic.service.computingservice.internal;
18+
package org.apache.mnemonic.service.computing.internal;
1919

20-
import org.apache.mnemonic.service.computingservice.GeneralComputingService;
21-
import org.apache.mnemonic.service.computingservice.ValueInfo;
20+
import org.apache.mnemonic.service.computing.GeneralComputingService;
21+
import org.apache.mnemonic.service.computing.ValueInfo;
2222
import org.flowcomputing.commons.primitives.NativeLibraryLoader;
2323

2424
public class PrintServiceImpl implements GeneralComputingService {

‎mnemonic-computing-services/mnemonic-utilities-service/src/main/java/org/apache/mnemonic/service/computingservice/internal/SortServiceImpl.java‎ renamed to ‎mnemonic-computing-services/mnemonic-utilities-service/src/main/java/org/apache/mnemonic/service/computing/internal/SortServiceImpl.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
* limitations under the License.
1616
*/
1717

18-
package org.apache.mnemonic.service.computingservice.internal;
18+
package org.apache.mnemonic.service.computing.internal;
1919

20-
import org.apache.mnemonic.service.computingservice.GeneralComputingService;
21-
import org.apache.mnemonic.service.computingservice.ValueInfo;
20+
import org.apache.mnemonic.service.computing.GeneralComputingService;
21+
import org.apache.mnemonic.service.computing.ValueInfo;
2222
import org.flowcomputing.commons.primitives.NativeLibraryLoader;
2323

2424
public class SortServiceImpl implements GeneralComputingService {

‎mnemonic-computing-services/mnemonic-utilities-service/src/main/native/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ find_package(Threads REQUIRED)
3737
include_directories(${CMAKE_THREAD_LIBS_INIT})
3838

3939
add_library(utilitiescomputing SHARED common.c
40-
org_apache_mnemonic_service_computingservice_internal_SortServiceImpl.c
41-
org_apache_mnemonic_service_computingservice_internal_PrintServiceImpl.c)
40+
org_apache_mnemonic_service_computing_internal_SortServiceImpl.c
41+
org_apache_mnemonic_service_computing_internal_PrintServiceImpl.c)
4242
target_include_directories(utilitiescomputing PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
4343

4444
include (InstallRequiredSystemLibraries)

‎mnemonic-computing-services/mnemonic-utilities-service/src/main/native/common.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ struct NValueInfo *constructNValInfo(JNIEnv* env, jobject vinfoobj) {
7676

7777
if (0 == inited) {
7878
inited = 1;
79-
vinfocls = (*env)->FindClass(env, "org/apache/mnemonic/service/computingservice/ValueInfo");
79+
vinfocls = (*env)->FindClass(env, "org/apache/mnemonic/service/computing/ValueInfo");
8080
dutenum = (*env)->FindClass(env, "org/apache/mnemonic/DurableType");
8181
if (NULL != vinfocls && NULL != dutenum) {
8282
handler_fid = (*env)->GetFieldID(env, vinfocls, "handler", "J");

‎mnemonic-computing-services/mnemonic-utilities-service/src/main/native/org_apache_mnemonic_service_computingservice_internal_PrintServiceImpl.c‎ renamed to ‎mnemonic-computing-services/mnemonic-utilities-service/src/main/native/org_apache_mnemonic_service_computing_internal_PrintServiceImpl.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* limitations under the License.
1717
*/
1818

19-
#include "org_apache_mnemonic_service_computingservice_internal_PrintServiceImpl.h"
19+
#include "org_apache_mnemonic_service_computing_internal_PrintServiceImpl.h"
2020

2121
/******************************************************************************
2222
** JNI implementations
@@ -74,7 +74,7 @@ void valPrintHandler(JNIEnv* env, size_t dims[], size_t dimidx,
7474
* It could return a set of handlers as results or in-place update the data indicated by value matrixes.
7575
*/
7676
JNIEXPORT
77-
jlongArray JNICALL Java_org_apache_mnemonic_service_computingservice_internal_PrintServiceImpl_nperformPrint(JNIEnv* env,
77+
jlongArray JNICALL Java_org_apache_mnemonic_service_computing_internal_PrintServiceImpl_nperformPrint(JNIEnv* env,
7878
jobject this, jobjectArray vinfos) {
7979
jlongArray ret = NULL;
8080
jsize retsz = 1;

‎mnemonic-computing-services/mnemonic-utilities-service/src/main/native/org_apache_mnemonic_service_computingservice_internal_PrintServiceImpl.h‎ renamed to ‎mnemonic-computing-services/mnemonic-utilities-service/src/main/native/org_apache_mnemonic_service_computing_internal_PrintServiceImpl.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,25 +21,25 @@
2121

2222
#include "common.h"
2323

24-
#ifndef _Included_org_apache_mnemonic_service_computingservice_internal_PrintServiceImpl
25-
#define _Included_org_apache_mnemonic_service_computingservice_internal_PrintServiceImpl
24+
#ifndef _Included_org_apache_mnemonic_service_computing_internal_PrintServiceImpl
25+
#define _Included_org_apache_mnemonic_service_computing_internal_PrintServiceImpl
2626
#ifdef __cplusplus
2727
extern "C" {
2828
#endif
2929
/*
30-
* Class: org_apache_mnemonic_service_computingservice_internal_PrintServiceImpl
30+
* Class: org_apache_mnemonic_service_computing_internal_PrintServiceImpl
3131
* Method: jniInit
3232
* Signature: (II)V
3333
*/
34-
JNIEXPORT void JNICALL Java_org_apache_mnemonic_service_computingservice_internal_PrintServiceImpl_jniInit
34+
JNIEXPORT void JNICALL Java_org_apache_mnemonic_service_computing_internal_PrintServiceImpl_jniInit
3535
(JNIEnv *, jobject, jint, jint);
3636

3737
/*
38-
* Class: org_apache_mnemonic_service_computingservice_internal_PrintServiceImpl
38+
* Class: org_apache_mnemonic_service_computing_internal_PrintServiceImpl
3939
* Method: jniTerm
4040
* Signature: ()V
4141
*/
42-
JNIEXPORT void JNICALL Java_org_apache_mnemonic_service_memoryservice_internal_PrintServiceImpl_jniTerm
42+
JNIEXPORT void JNICALL Java_org_apache_mnemonic_service_memory_internal_PrintServiceImpl_jniTerm
4343
(JNIEnv *, jobject);
4444

4545
#ifdef __cplusplus

‎mnemonic-computing-services/mnemonic-utilities-service/src/main/native/org_apache_mnemonic_service_computingservice_internal_SortServiceImpl.c‎ renamed to ‎mnemonic-computing-services/mnemonic-utilities-service/src/main/native/org_apache_mnemonic_service_computing_internal_SortServiceImpl.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* limitations under the License.
1717
*/
1818

19-
#include "org_apache_mnemonic_service_computingservice_internal_SortServiceImpl.h"
19+
#include "org_apache_mnemonic_service_computing_internal_SortServiceImpl.h"
2020

2121
/******************************************************************************
2222
** JNI implementations
@@ -109,7 +109,7 @@ void valSimpleSortHandler(JNIEnv* env, size_t dims[], size_t dimidx,
109109
* It could return a set of handlers as results or in-place update the data indicated by value matrixes.
110110
*/
111111
JNIEXPORT
112-
jlongArray JNICALL Java_org_apache_mnemonic_service_computingservice_internal_SortServiceImpl_nperformBubbleSort(JNIEnv* env,
112+
jlongArray JNICALL Java_org_apache_mnemonic_service_computing_internal_SortServiceImpl_nperformBubbleSort(JNIEnv* env,
113113
jobject this, jobjectArray vinfos) {
114114
jlongArray ret = NULL;
115115
jsize retsz = 1;
@@ -222,7 +222,7 @@ long handle1DLongBubbleSort(JNIEnv* env, struct NValueInfo *nvinfo, SortInfo *so
222222
}
223223

224224
JNIEXPORT
225-
jlongArray JNICALL Java_org_apache_mnemonic_service_computingservice_internal_SortServiceImpl_nperform1DLongBubbleSort(
225+
jlongArray JNICALL Java_org_apache_mnemonic_service_computing_internal_SortServiceImpl_nperform1DLongBubbleSort(
226226
JNIEnv* env, jobject this, jobjectArray vinfos) {
227227
jlongArray ret = NULL;
228228
jsize retsz = 1;

‎mnemonic-computing-services/mnemonic-utilities-service/src/main/native/org_apache_mnemonic_service_computingservice_internal_SortServiceImpl.h‎ renamed to ‎mnemonic-computing-services/mnemonic-utilities-service/src/main/native/org_apache_mnemonic_service_computing_internal_SortServiceImpl.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,25 +21,25 @@
2121

2222
#include "common.h"
2323

24-
#ifndef _Included_org_apache_mnemonic_service_computingservice_internal_SortServiceImpl
25-
#define _Included_org_apache_mnemonic_service_computingservice_internal_SortServiceImpl
24+
#ifndef _Included_org_apache_mnemonic_service_computing_internal_SortServiceImpl
25+
#define _Included_org_apache_mnemonic_service_computing_internal_SortServiceImpl
2626
#ifdef __cplusplus
2727
extern "C" {
2828
#endif
2929
/*
30-
* Class: org_apache_mnemonic_service_computingservice_internal_SortServiceImpl
30+
* Class: org_apache_mnemonic_service_computing_internal_SortServiceImpl
3131
* Method: jniInit
3232
* Signature: (II)V
3333
*/
34-
JNIEXPORT void JNICALL Java_org_apache_mnemonic_service_computingservice_internal_SortServiceImpl_jniInit
34+
JNIEXPORT void JNICALL Java_org_apache_mnemonic_service_computing_internal_SortServiceImpl_jniInit
3535
(JNIEnv *, jobject, jint, jint);
3636

3737
/*
38-
* Class: org_apache_mnemonic_service_computingservice_internal_SortServiceImpl
38+
* Class: org_apache_mnemonic_service_computing_internal_SortServiceImpl
3939
* Method: jniTerm
4040
* Signature: ()V
4141
*/
42-
JNIEXPORT void JNICALL Java_org_apache_mnemonic_service_memoryservice_internal_SortServiceImpl_jniTerm
42+
JNIEXPORT void JNICALL Java_org_apache_mnemonic_service_memory_internal_SortServiceImpl_jniTerm
4343
(JNIEnv *, jobject);
4444

4545
#ifdef __cplusplus

‎mnemonic-computing-services/mnemonic-utilities-service/src/main/resources/META-INF/services/org.apache.mnemonic.service.computing.GeneralComputingService‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
org.apache.mnemonic.service.computing.internal.PrintServiceImpl
2+
org.apache.mnemonic.service.computing.internal.SortServiceImpl

0 commit comments

Comments
 (0)