Skip to content

Fix some compile and script errors #259

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
imay merged 1 commit into from
Oct 31, 2018
Merged

Fix some compile and script errors #259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions be/test/olap/file_utils_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ TEST_F(FileUtilsTest, TestCopyFile) {
char* large_bytes2[(1 << 12)];
memset(large_bytes2, 0, sizeof(char)*((1 << 12)));
int i = 0;
while (i < 1 << 19) {
while (i < 1 << 10) {
src_file_handler.write(large_bytes2, ((1 << 12)));
++i;
}
Expand All @@ -80,7 +80,7 @@ TEST_F(FileUtilsTest, TestCopyFile) {
FileHandler dst_file_handler;
dst_file_handler.open(dst_file_name, O_RDONLY);
int64_t dst_length = dst_file_handler.length();
int64_t src_length = 2147483661;
int64_t src_length = 4194317;
ASSERT_EQ(src_length, dst_length);
}

Expand Down
8 changes: 1 addition & 7 deletions bin/start_fe.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,6 @@ JAVA=$JAVA_HOME/bin/java
for f in $DORIS_HOME/lib/*.jar; do
CLASSPATH=$f:${CLASSPATH};
done
for f in $DORIS_HOME/lib/kudu-client/*.jar; do
CLASSPATH=$f:${CLASSPATH};
done
for f in $DORIS_HOME/lib/k8s-client/*.jar; do
CLASSPATH=$f:${CLASSPATH};
done
export CLASSPATH=${CLASSPATH}:${DORIS_HOME}/lib

if [ ! -d $LOG_DIR ]; then
Expand All @@ -79,6 +73,6 @@ else
fi

echo `date` >> $LOG_DIR/fe.out
nohup $LIMIT $JAVA $JAVA_OPTS com.baidu.palo.PaloFe "$@" >> $LOG_DIR/fe.out 2>&1 </dev/null &
nohup $LIMIT $JAVA $JAVA_OPTS org.apache.doris.PaloFe "$@" >> $LOG_DIR/fe.out 2>&1 </dev/null &

echo $! > $pidfile
4 changes: 3 additions & 1 deletion fe/src/test/java/org/apache/doris/task/LoadEtlTaskTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.powermock.api.easymock.PowerMock;
import org.powermock.core.classloader.annotations.PowerMockIgnore;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;

Expand All @@ -60,6 +61,7 @@

@RunWith(PowerMockRunner.class)
@PrepareForTest({ HadoopLoadEtlTask.class, Catalog.class })
@PowerMockIgnore("javax.management.*")
public class LoadEtlTaskTest {
private long dbId;
private long tableId;
Expand Down Expand Up @@ -184,4 +186,4 @@ public void testRunEtlTask() throws Exception {
Assert.assertEquals(tabletNum, tabletLoadInfos.size());
}

}
}
2 changes: 2 additions & 0 deletions fe/src/test/java/org/apache/doris/task/LoadPendingTaskTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.powermock.api.easymock.PowerMock;
import org.powermock.core.classloader.annotations.PowerMockIgnore;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;

Expand All @@ -53,6 +54,7 @@

@RunWith(PowerMockRunner.class)
@PrepareForTest({ HadoopLoadPendingTask.class, Catalog.class })
@PowerMockIgnore("javax.management.*")
public class LoadPendingTaskTest {
private long dbId;
private long tableId;
Expand Down
24 changes: 24 additions & 0 deletions fe/src/test/resources/log4j2.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<Configuration status="WARN">
<Appenders>
<Console name="Console" target="SYSTEM_OUT">
<PatternLayout pattern="%d{YYYY-MM-dd HH:mm:ss} [%t] %-5p %c{1}:%L - %msg%n" />
</Console>

<RollingFile name="RollingFile" filename="log/fe_test.log"
filepattern="${logPath}/%d{YYYYMMddHHmmss}-fargo.log">
<PatternLayout pattern="%d{YYYY-MM-dd HH:mm:ss} [%t] %-5p %c{1}:%L - %msg%n" />
<Policies>
<SizeBasedTriggeringPolicy size="100 MB" />
</Policies>
<DefaultRolloverStrategy max="20" />
</RollingFile>

</Appenders>
<Loggers>
<Root level="info">
<AppenderRef ref="Console" />
<AppenderRef ref="RollingFile" />
</Root>
</Loggers>
</Configuration>
2 changes: 1 addition & 1 deletion fs_brokers/apache_hdfs_broker/bin/start_broker.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,6 @@ if [ ! -d $BROKER_LOG_DIR ]; then
fi

echo `date` >> $BROKER_LOG_DIR/apache_hdfs_broker.out
nohup $LIMIT $JAVA $JAVA_OPTS com.baidu.palo.broker.hdfs.BrokerBootstrap "$@" >> $BROKER_LOG_DIR/apache_hdfs_broker.out 2>&1 </dev/null &
nohup $LIMIT $JAVA $JAVA_OPTS org.apache.doris.broker.hdfs.BrokerBootstrap "$@" >> $BROKER_LOG_DIR/apache_hdfs_broker.out 2>&1 </dev/null &

echo $! > $pidfile