Skip to content

Commit 95013d1

Browse files
committed
Refactor: rename Java packages from org.greenplum to org.apache.cloudberry
This commit performs a global rebranding of the Java package structure to align with the Apache Cloudberry project naming conventions and the official domain (cloudberry.apache.org). Key changes: * Renamed all Java package declarations and import statements from 'org.greenplum' to 'org.apache.cloudberry'. * Restructured physical directory paths from 'org/greenplum/' to 'org/apache/cloudberry/' across all modules (server and automation). * Updated build configurations: - Gradle 'group' in server/build.gradle - Maven 'groupId' and dependencies in automation/pom.xml * Adjusted configuration files including: - pxf-profiles-default.xml - application.properties - log4j2.xml / log4j.properties * Updated SQL scripts, test expected outputs (.ans, .out), and CI entrypoint scripts. This is a structural refactoring with no changes to functional logic. But please note this will be a breaking change for developers.
1 parent bfa5149 commit 95013d1

627 files changed

Lines changed: 5143 additions & 5143 deletions

File tree

Some content is hidden

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

automation/pom.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
66

7-
<groupId>org.greenplum.pxf.automation</groupId>
7+
<groupId>org.apache.cloudberry.pxf.automation</groupId>
88
<artifactId>pxf-automation</artifactId>
99
<version>0.0.1-SNAPSHOT</version>
1010
<packaging>jar</packaging>
@@ -86,31 +86,31 @@
8686
</build>
8787
<dependencies>
8888
<dependency>
89-
<groupId>org.greenplum</groupId>
89+
<groupId>org.apache.cloudberry</groupId>
9090
<artifactId>pxf-api</artifactId>
9191
<scope>system</scope>
9292
<systemPath>${pxf.lib}/pxf-api.jar</systemPath>
9393
<version>LATEST</version>
9494
</dependency>
9595

9696
<dependency>
97-
<groupId>org.greenplum</groupId>
97+
<groupId>org.apache.cloudberry</groupId>
9898
<artifactId>pxf-hbase</artifactId>
9999
<scope>system</scope>
100100
<systemPath>${pxf.lib}/pxf-hbase.jar</systemPath>
101101
<version>LATEST</version>
102102
</dependency>
103103

104104
<dependency>
105-
<groupId>org.greenplum</groupId>
105+
<groupId>org.apache.cloudberry</groupId>
106106
<artifactId>pxf-hdfs</artifactId>
107107
<scope>system</scope>
108108
<systemPath>${pxf.lib}/pxf-hdfs.jar</systemPath>
109109
<version>LATEST</version>
110110
</dependency>
111111

112112
<dependency>
113-
<groupId>org.greenplum</groupId>
113+
<groupId>org.apache.cloudberry</groupId>
114114
<artifactId>pxf-hive</artifactId>
115115
<scope>system</scope>
116116
<systemPath>${pxf.lib}/pxf-hive.jar</systemPath>
@@ -120,7 +120,7 @@
120120
<!-- Introduced for MapR dependencies that need to be classloaded
121121
before hadoop-common and hadoop-auth. -->
122122
<dependency>
123-
<groupId>org.greenplum</groupId>
123+
<groupId>org.apache.cloudberry</groupId>
124124
<artifactId>pxf-extras</artifactId>
125125
<scope>system</scope>
126126
<systemPath>${pxf.lib}/pxf-extras.jar</systemPath>

automation/sqlrepo/features/general/outOfMemory/expected/query01.ans

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ ERROR: PXF server error : java.lang.OutOfMemoryError: Java heap space
3030
-- start_ignore
3131
HINT: Check the PXF logs located in the 'logs-dir' directory on host 'mdw' or 'set client_min_messages=LOG' for additional details.
3232
-- end_ignore
33-
CONTEXT: External table test_out_of_memory, file pxf://dummy_path?FRAGMENTER=org.greenplum.pxf.automation.testplugin.OutOfMemoryFragmenter&ACCESSOR=org.greenplum.pxf.plugins.hdfs.LineBreakAccessor&RESOLVER=org.greenplum.pxf.plugins.hdfs.StringPassResolver
33+
CONTEXT: External table test_out_of_memory, file pxf://dummy_path?FRAGMENTER=org.apache.cloudberry.pxf.automation.testplugin.OutOfMemoryFragmenter&ACCESSOR=org.apache.cloudberry.pxf.plugins.hdfs.LineBreakAccessor&RESOLVER=org.apache.cloudberry.pxf.plugins.hdfs.StringPassResolver
3434
-- wait until the JVM has been killed
3535
SELECT pg_sleep(3);
3636
pg_sleep
@@ -44,4 +44,4 @@ ERROR: PXF server error : Failed to connect to server, must be down
4444
-- start_ignore
4545
HINT: Use the 'pxf [cluster] start' command to start the PXF service.
4646
-- end_ignore
47-
CONTEXT: External table test_out_of_memory, file pxf://dummy_path?FRAGMENTER=org.greenplum.pxf.automation.testplugin.OutOfMemoryFragmenter&ACCESSOR=org.greenplum.pxf.plugins.hdfs.LineBreakAccessor&RESOLVER=org.greenplum.pxf.plugins.hdfs.StringPassResolver
47+
CONTEXT: External table test_out_of_memory, file pxf://dummy_path?FRAGMENTER=org.apache.cloudberry.pxf.automation.testplugin.OutOfMemoryFragmenter&ACCESSOR=org.apache.cloudberry.pxf.plugins.hdfs.LineBreakAccessor&RESOLVER=org.apache.cloudberry.pxf.plugins.hdfs.StringPassResolver

automation/sqlrepo/features/hdfs/readable/text/errors/middle_of_stream/expected/query01.ans

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@
1616
SELECT * FROM error_on_10000 ORDER BY num ASC;
1717
ERROR: transfer error (18): Transferred a partial file from 'SOME_IP:SOME_PORT' (libchurl.c:xxx)
1818
DETAIL: curl error buffer: transfer closed with outstanding read data remaining
19-
CONTEXT: External table error_on_10000, line 10001 of file pxf://pxf_automation_data/data?FRAGMENTER=org.greenplum.pxf.plugins.hdfs.HdfsDataFragmenter&ACCESSOR=org.greenplum.pxf.automation.testplugin.ThrowOn10000Accessor&RESOLVER=org.greenplum.pxf.plugins.hdfs.StringPassResolver
19+
CONTEXT: External table error_on_10000, line 10001 of file pxf://pxf_automation_data/data?FRAGMENTER=org.apache.cloudberry.pxf.plugins.hdfs.HdfsDataFragmenter&ACCESSOR=org.apache.cloudberry.pxf.automation.testplugin.ThrowOn10000Accessor&RESOLVER=org.apache.cloudberry.pxf.plugins.hdfs.StringPassResolver

automation/sqlrepo/features/hive/errors/rc_mismatchedTypes/expected/query01.ans

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@
1818
--
1919
-- end_matchsubs
2020
SELECT * from gpdb_hive_types ORDER BY t1;
21-
ERROR: PXF server error : org.greenplum.pxf.api.error.UnsupportedTypeException: Invalid definition for column sml: expected GPDB type SMALLINT, actual GPDB type INTEGER
21+
ERROR: PXF server error : org.apache.cloudberry.pxf.api.error.UnsupportedTypeException: Invalid definition for column sml: expected GPDB type SMALLINT, actual GPDB type INTEGER
2222
HINT: Check the PXF logs located in the '/home/gpadmin/pxf-base/logs' directory on host '0.0.0.0' or 'set client_min_messages=LOG' for additional details.
23-
CONTEXT: External table gpdb_hive_types, line 1 of pxf://hive_types_rc?FRAGMENTER=org.greenplum.pxf.plugins.hive.HiveInputFormatFragmenter&ACCESSOR=org.greenplum.pxf.plugins.hive.HiveRCFileAccessor&RESOLVER=org.greenplum.pxf.plugins.hive.HiveColumnarSerdeResolver: ""
23+
CONTEXT: External table gpdb_hive_types, line 1 of pxf://hive_types_rc?FRAGMENTER=org.apache.cloudberry.pxf.plugins.hive.HiveInputFormatFragmenter&ACCESSOR=org.apache.cloudberry.pxf.plugins.hive.HiveRCFileAccessor&RESOLVER=org.apache.cloudberry.pxf.plugins.hive.HiveColumnarSerdeResolver: ""

automation/src/main/java/listeners/FDWSkipTestAnalyzer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import annotations.FailsWithFDW;
44
import annotations.SkipForFDW;
55
import annotations.WorksWithFDW;
6-
import org.greenplum.pxf.automation.utils.system.FDWUtils;
6+
import org.apache.cloudberry.pxf.automation.utils.system.FDWUtils;
77
import org.testng.IInvokedMethod;
88
import org.testng.IInvokedMethodListener;
99
import org.testng.ITestResult;

automation/src/main/java/org/greenplum/pxf/automation/components/cluster/MultiNodeCluster.java renamed to automation/src/main/java/org/apache/cloudberry/pxf/automation/components/cluster/MultiNodeCluster.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.greenplum.pxf.automation.components.cluster;
1+
package org.apache.cloudberry.pxf.automation.components.cluster;
22

33
import java.io.File;
44
import java.net.Inet4Address;
@@ -12,11 +12,11 @@
1212
import org.apache.commons.io.FileUtils;
1313
import org.apache.commons.lang.StringUtils;
1414

15-
import org.greenplum.pxf.automation.components.cluster.installer.nodes.CoordinatorNode;
16-
import org.greenplum.pxf.automation.components.cluster.installer.nodes.Node;
17-
import org.greenplum.pxf.automation.components.cluster.installer.nodes.SegmentNode;
18-
import org.greenplum.pxf.automation.components.common.cli.ParallelShellActions;
19-
import org.greenplum.pxf.automation.utils.jsystem.report.ReportUtils;
15+
import org.apache.cloudberry.pxf.automation.components.cluster.installer.nodes.CoordinatorNode;
16+
import org.apache.cloudberry.pxf.automation.components.cluster.installer.nodes.Node;
17+
import org.apache.cloudberry.pxf.automation.components.cluster.installer.nodes.SegmentNode;
18+
import org.apache.cloudberry.pxf.automation.components.common.cli.ParallelShellActions;
19+
import org.apache.cloudberry.pxf.automation.utils.jsystem.report.ReportUtils;
2020

2121
/**
2222
* Describes multiple nodes cluster. {@link Node} array holds Nodes with ssh connection to every

automation/src/main/java/org/greenplum/pxf/automation/components/cluster/PhdCluster.java renamed to automation/src/main/java/org/apache/cloudberry/pxf/automation/components/cluster/PhdCluster.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package org.greenplum.pxf.automation.components.cluster;
1+
package org.apache.cloudberry.pxf.automation.components.cluster;
22

33
import org.apache.commons.lang.StringUtils;
4-
import org.greenplum.pxf.automation.components.cluster.installer.nodes.Node;
5-
import org.greenplum.pxf.automation.components.common.ShellSystemObject;
6-
import org.greenplum.pxf.automation.structures.profiles.PxfProfileXml;
7-
import org.greenplum.pxf.automation.utils.jsystem.report.ReportUtils;
4+
import org.apache.cloudberry.pxf.automation.components.cluster.installer.nodes.Node;
5+
import org.apache.cloudberry.pxf.automation.components.common.ShellSystemObject;
6+
import org.apache.cloudberry.pxf.automation.structures.profiles.PxfProfileXml;
7+
import org.apache.cloudberry.pxf.automation.utils.jsystem.report.ReportUtils;
88

99
import java.io.File;
1010
import java.nio.file.Files;

automation/src/main/java/org/greenplum/pxf/automation/components/cluster/SingleCluster.java renamed to automation/src/main/java/org/apache/cloudberry/pxf/automation/components/cluster/SingleCluster.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package org.greenplum.pxf.automation.components.cluster;
1+
package org.apache.cloudberry.pxf.automation.components.cluster;
22

33
import org.apache.commons.io.FileUtils;
44
import org.apache.commons.lang.StringUtils;
5-
import org.greenplum.pxf.automation.components.cluster.installer.nodes.Node;
6-
import org.greenplum.pxf.automation.components.common.cli.ShellCommandErrorException;
7-
import org.greenplum.pxf.automation.utils.jsystem.report.ReportUtils;
5+
import org.apache.cloudberry.pxf.automation.components.cluster.installer.nodes.Node;
6+
import org.apache.cloudberry.pxf.automation.components.common.cli.ShellCommandErrorException;
7+
import org.apache.cloudberry.pxf.automation.utils.jsystem.report.ReportUtils;
88

99
import java.io.File;
1010
import java.io.IOException;

automation/src/main/java/org/greenplum/pxf/automation/components/cluster/installer/nodes/CoordinatorNode.java renamed to automation/src/main/java/org/apache/cloudberry/pxf/automation/components/cluster/installer/nodes/CoordinatorNode.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.greenplum.pxf.automation.components.cluster.installer.nodes;
1+
package org.apache.cloudberry.pxf.automation.components.cluster.installer.nodes;
22

33
/**
44
* Represents Coordinator Node for a cluster

automation/src/main/java/org/greenplum/pxf/automation/components/cluster/installer/nodes/Node.java renamed to automation/src/main/java/org/apache/cloudberry/pxf/automation/components/cluster/installer/nodes/Node.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
package org.greenplum.pxf.automation.components.cluster.installer.nodes;
1+
package org.apache.cloudberry.pxf.automation.components.cluster.installer.nodes;
22

33
import java.util.ArrayList;
44
import java.util.Arrays;
55
import java.util.List;
66

77
import org.apache.commons.lang.StringUtils;
88

9-
import org.greenplum.pxf.automation.components.common.ShellSystemObject;
9+
import org.apache.cloudberry.pxf.automation.components.common.ShellSystemObject;
1010

1111
/**
1212
* Represents any Node, using ssh connectivity.

0 commit comments

Comments
 (0)