Repository: incubator-carbondata Updated Branches: refs/heads/master 33544d32e -> 1e5db53a4
clean code Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/6c73d885 Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/6c73d885 Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/6c73d885 Branch: refs/heads/master Commit: 6c73d88578b0c5675b26502768974f958594a820 Parents: 33544d3 Author: QiangCai <qiang...@qq.com> Authored: Fri Apr 7 20:49:14 2017 +0530 Committer: QiangCai <qiang...@qq.com> Committed: Fri Apr 7 20:49:14 2017 +0530 ---------------------------------------------------------------------- assembly/src/main/assembly/assembly.xml | 2 +- common/src/test/java/log4j.properties | 7 ++----- .../carbondata/common/logging/ft/LoggingServiceTest_FT.java | 4 ++-- .../core/datastore/impl/btree/AbstractBTreeBuilder.java | 2 +- .../core/fileoperations/AtomicFileOperationsImpl.java | 3 --- 5 files changed, 6 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/6c73d885/assembly/src/main/assembly/assembly.xml ---------------------------------------------------------------------- diff --git a/assembly/src/main/assembly/assembly.xml b/assembly/src/main/assembly/assembly.xml index 14d679f..1b27074 100644 --- a/assembly/src/main/assembly/assembly.xml +++ b/assembly/src/main/assembly/assembly.xml @@ -24,7 +24,7 @@ <dependencySets> <dependencySet> <includes> - <include>org.huawei.datasight:*:jar</include> + <include>org.apache.carbondata:*:jar</include> </includes> </dependencySet> <dependencySet> http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/6c73d885/common/src/test/java/log4j.properties ---------------------------------------------------------------------- diff --git a/common/src/test/java/log4j.properties b/common/src/test/java/log4j.properties index 3d35725..db0fbe2 100644 --- a/common/src/test/java/log4j.properties +++ b/common/src/test/java/log4j.properties @@ -15,12 +15,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -log4j.logger.com.huawei=INFO,R5 +log4j.logger.org.apache.carbondata=INFO,R5 log4j.appender.R5=org.apache.carbondata.common.logging.impl.AuditExtendedRollingFileAppender -log4j.appender.R5.File=./unibiaudit.log +log4j.appender.R5.File=./carbondataaudit.log log4j.appender.R5.threshold=AUDIT#org.apache.carbondata.common.logging.AuditLevel log4j.appender.R5.layout=org.apache.log4j.PatternLayout log4j.appender.R5.layout.ConversionPattern=%d [%t] %p [%c] %X{CLIENT_IP} %X{USER_NAME} %X{MODULE} %X{OPERATRION}- %m%n - - - http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/6c73d885/common/src/test/java/org/apache/carbondata/common/logging/ft/LoggingServiceTest_FT.java ---------------------------------------------------------------------- diff --git a/common/src/test/java/org/apache/carbondata/common/logging/ft/LoggingServiceTest_FT.java b/common/src/test/java/org/apache/carbondata/common/logging/ft/LoggingServiceTest_FT.java index c72dde1..1f000ce 100644 --- a/common/src/test/java/org/apache/carbondata/common/logging/ft/LoggingServiceTest_FT.java +++ b/common/src/test/java/org/apache/carbondata/common/logging/ft/LoggingServiceTest_FT.java @@ -54,14 +54,14 @@ public class LoggingServiceTest_FT extends TestCase { @Test public void testAudit() { String expectedAuditLine = - "[main] AUDIT [com.huawei.iweb.platform.logging.ft.LoggingServiceTest_FT] 127.0.0.1 " + "[main] AUDIT [org.apache.carbondata.common.logging.ft.LoggingServiceTest_FT] 127.0.0.1 " + "testuser Function Test log- audit message created"; logger.audit("audit message created"); LogManager.shutdown(); try { - FileInputStream fstream = new FileInputStream("./unibiaudit.log"); + FileInputStream fstream = new FileInputStream("./carbondataaudit.log"); BufferedReader br = new BufferedReader(new InputStreamReader(fstream)); String actualAuditLine = null; String strLine = null; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/6c73d885/core/src/main/java/org/apache/carbondata/core/datastore/impl/btree/AbstractBTreeBuilder.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/impl/btree/AbstractBTreeBuilder.java b/core/src/main/java/org/apache/carbondata/core/datastore/impl/btree/AbstractBTreeBuilder.java index e71f1eb..4e9f4b1 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastore/impl/btree/AbstractBTreeBuilder.java +++ b/core/src/main/java/org/apache/carbondata/core/datastore/impl/btree/AbstractBTreeBuilder.java @@ -52,7 +52,7 @@ public abstract class AbstractBTreeBuilder implements BtreeBuilder { public AbstractBTreeBuilder() { maxNumberOfEntriesInNonLeafNodes = Integer.parseInt(CarbonProperties.getInstance() - .getProperty("com.huawei.datastore.internalnodesize", + .getProperty("org.apache.carbondata.core.datastore.internalnodesize", DEFAULT_NUMBER_OF_ENTRIES_NONLEAF + "")); } http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/6c73d885/core/src/main/java/org/apache/carbondata/core/fileoperations/AtomicFileOperationsImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/fileoperations/AtomicFileOperationsImpl.java b/core/src/main/java/org/apache/carbondata/core/fileoperations/AtomicFileOperationsImpl.java index 353660d..befc76e 100644 --- a/core/src/main/java/org/apache/carbondata/core/fileoperations/AtomicFileOperationsImpl.java +++ b/core/src/main/java/org/apache/carbondata/core/fileoperations/AtomicFileOperationsImpl.java @@ -64,9 +64,6 @@ public class AtomicFileOperationsImpl implements AtomicFileOperations { } - /* (non-Javadoc) - * @see com.huawei.unibi.carbon.datastorage.store.fileperations.AtomicFileOperations#close() - */ @Override public void close() throws IOException { if (null != dataOutStream) {