Skip to content

Commit

Permalink
Merge branch 'main' into ir_fix_auxilia
Browse files Browse the repository at this point in the history
  • Loading branch information
BingqingLyu authored Nov 20, 2023
2 parents e84b2c2 + efce199 commit 334b842
Show file tree
Hide file tree
Showing 10 changed files with 41 additions and 41 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docker/graphscope-store.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM ubuntu:22.04

RUN apt-get update -y && \
apt-get install -y sudo default-jdk && \
apt-get install -y sudo default-jdk tzdata && \
apt-get clean -y && \
rm -rf /var/lib/apt/lists/*

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ FROM ubuntu:22.04
ADD artifacts/artifacts.tar.gz /opt/graphscope/

RUN apt-get update -y && \
apt-get install -y sudo default-jdk && \
apt-get install -y sudo default-jdk tzdata && \
apt-get clean -y && \
rm -rf /var/lib/apt/lists/*

Expand Down
42 changes: 21 additions & 21 deletions flex/storages/rt_mutable_graph/loader/csv_fragment_loader.cc
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ static void set_vertex_properties(gs::ColumnBase* col,
auto col_type = col->type();
size_t cur_ind = 0;
if (col_type == PropertyType::kBool) {
CHECK(type == arrow::boolean())
CHECK(type->Equals(arrow::boolean()))
<< "Inconsistent data type, expect bool, but got " << type->ToString();
for (auto j = 0; j < array->num_chunks(); ++j) {
auto casted =
Expand All @@ -210,7 +210,7 @@ static void set_vertex_properties(gs::ColumnBase* col,
}
}
} else if (col_type == PropertyType::kInt64) {
CHECK(type == arrow::int64())
CHECK(type->Equals(arrow::int64()))
<< "Inconsistent data type, expect int64, but got " << type->ToString();
for (auto j = 0; j < array->num_chunks(); ++j) {
auto casted =
Expand All @@ -222,7 +222,7 @@ static void set_vertex_properties(gs::ColumnBase* col,
}
}
} else if (col_type == PropertyType::kInt32) {
CHECK(type == arrow::int32())
CHECK(type->Equals(arrow::int32()))
<< "Inconsistent data type, expect int32, but got " << type->ToString();
for (auto j = 0; j < array->num_chunks(); ++j) {
auto casted =
Expand All @@ -234,7 +234,7 @@ static void set_vertex_properties(gs::ColumnBase* col,
}
}
} else if (col_type == PropertyType::kUInt64) {
CHECK(type == arrow::uint64())
CHECK(type->Equals(arrow::uint64()))
<< "Inconsistent data type, expect uint64, but got "
<< type->ToString();
for (auto j = 0; j < array->num_chunks(); ++j) {
Expand All @@ -247,7 +247,7 @@ static void set_vertex_properties(gs::ColumnBase* col,
}
}
} else if (col_type == PropertyType::kUInt32) {
CHECK(type == arrow::uint32())
CHECK(type->Equals(arrow::uint32()))
<< "Inconsistent data type, expect uint32, but got "
<< type->ToString();
for (auto j = 0; j < array->num_chunks(); ++j) {
Expand All @@ -260,7 +260,7 @@ static void set_vertex_properties(gs::ColumnBase* col,
}
}
} else if (col_type == PropertyType::kDouble) {
CHECK(type == arrow::float64())
CHECK(type->Equals(arrow::float64()))
<< "Inconsistent data type, expect double, but got "
<< type->ToString();
for (auto j = 0; j < array->num_chunks(); ++j) {
Expand All @@ -272,7 +272,7 @@ static void set_vertex_properties(gs::ColumnBase* col,
}
}
} else if (col_type == PropertyType::kFloat) {
CHECK(type == arrow::float32())
CHECK(type->Equals(arrow::float32()))
<< "Inconsistent data type, expect float, but got " << type->ToString();
for (auto j = 0; j < array->num_chunks(); ++j) {
auto casted =
Expand All @@ -283,10 +283,10 @@ static void set_vertex_properties(gs::ColumnBase* col,
}
}
} else if (col_type == PropertyType::kString) {
CHECK(type == arrow::large_utf8() || type == arrow::utf8())
CHECK(type->Equals(arrow::large_utf8()) || type->Equals(arrow::utf8()))
<< "Inconsistent data type, expect string, but got "
<< type->ToString();
if (type == arrow::large_utf8()) {
if (type->Equals(arrow::large_utf8())) {
for (auto j = 0; j < array->num_chunks(); ++j) {
auto casted =
std::static_pointer_cast<arrow::LargeStringArray>(array->chunk(j));
Expand Down Expand Up @@ -342,16 +342,16 @@ static void append_edges(
auto indexer_check_lambda = [](const LFIndexer<vid_t>& cur_indexer,
const std::shared_ptr<arrow::Array>& cur_col) {
if (cur_indexer.get_type() == PropertyType::kInt64) {
CHECK(cur_col->type() == arrow::int64());
CHECK(cur_col->type()->Equals(arrow::int64()));
} else if (cur_indexer.get_type() == PropertyType::kString) {
CHECK(cur_col->type() == arrow::utf8() ||
cur_col->type() == arrow::large_utf8());
CHECK(cur_col->type()->Equals(arrow::utf8()) ||
cur_col->type()->Equals(arrow::large_utf8()));
} else if (cur_indexer.get_type() == PropertyType::kInt32) {
CHECK(cur_col->type() == arrow::int32());
CHECK(cur_col->type()->Equals(arrow::int32()));
} else if (cur_indexer.get_type() == PropertyType::kUInt32) {
CHECK(cur_col->type() == arrow::uint32());
CHECK(cur_col->type()->Equals(arrow::uint32()));
} else if (cur_indexer.get_type() == PropertyType::kUInt64) {
CHECK(cur_col->type() == arrow::uint64());
CHECK(cur_col->type()->Equals(arrow::uint64()));
}
};

Expand All @@ -367,7 +367,7 @@ static void append_edges(
const auto& col = is_dst ? dst_col : src_col;
const auto& indexer = is_dst ? dst_indexer : src_indexer;
if constexpr (std::is_same_v<PK_T, std::string_view>) {
if (col->type() == arrow::utf8()) {
if (col->type()->Equals(arrow::utf8())) {
auto casted = std::static_pointer_cast<arrow::StringArray>(col);
for (auto j = 0; j < casted->length(); ++j) {
auto str = casted->GetView(j);
Expand Down Expand Up @@ -418,7 +418,7 @@ static void append_edges(
CHECK(src_col->length() == edata_col->length());
size_t cur_ind = old_size;
auto type = edata_col->type();
if (type != TypeConverter<EDATA_T>::ArrowTypeValue()) {
if (!type->Equals(TypeConverter<EDATA_T>::ArrowTypeValue())) {
LOG(FATAL) << "Inconsistent data type, expect "
<< TypeConverter<EDATA_T>::ArrowTypeValue()->ToString()
<< ", but got " << type->ToString();
Expand Down Expand Up @@ -458,7 +458,7 @@ struct _add_vertex {
// for non-string value
auto expected_type = gs::TypeConverter<KEY_T>::ArrowTypeValue();
using arrow_array_t = typename gs::TypeConverter<KEY_T>::ArrowArrayType;
if (col->type() != expected_type) {
if (!col->type()->Equals(expected_type)) {
LOG(FATAL) << "Inconsistent data type, expect "
<< expected_type->ToString() << ", but got "
<< col->type()->ToString();
Expand All @@ -472,7 +472,7 @@ struct _add_vertex {
vids.emplace_back(vid);
}
} else {
if (col->type() == arrow::utf8()) {
if (col->type()->Equals(arrow::utf8())) {
auto casted_array = std::static_pointer_cast<arrow::StringArray>(col);
for (auto i = 0; i < row_num; ++i) {
auto str = casted_array->GetView(i);
Expand All @@ -482,7 +482,7 @@ struct _add_vertex {
}
vids.emplace_back(vid);
}
} else if (col->type() == arrow::large_utf8()) {
} else if (col->type()->Equals(arrow::large_utf8())) {
auto casted_array =
std::static_pointer_cast<arrow::LargeStringArray>(col);
for (auto i = 0; i < row_num; ++i) {
Expand Down Expand Up @@ -770,7 +770,7 @@ void CSVFragmentLoader::addEdgesImpl(label_t src_label_id, label_t dst_label_id,
<< "unsupported src_col type: " << src_col_type->ToString();
CHECK(check_primary_key_type(dst_col_type))
<< "unsupported dst_col type: " << dst_col_type->ToString();
CHECK(src_col_type == dst_col_type)
CHECK(src_col_type->Equals(dst_col_type))
<< "src_col type: " << src_col_type->ToString()
<< " neq dst_col type: " << dst_col_type->ToString();

Expand Down
2 changes: 1 addition & 1 deletion k8s/dockerfiles/coordinator.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ RUN cd /home/graphscope/GraphScope/ && \
FROM ubuntu:22.04 AS coordinator

RUN apt-get update -y && \
apt-get install -y sudo python3-pip openmpi-bin curl && \
apt-get install -y sudo python3-pip openmpi-bin curl tzdata && \
apt-get clean -y && \
rm -rf /var/lib/apt/lists/*

Expand Down
5 changes: 2 additions & 3 deletions k8s/dockerfiles/graphscope-dev.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ ENV JAVA_HOME=/usr/lib/jvm/default-java
ENV RUST_BACKTRACE=1

RUN apt-get update && \
apt-get install python3-pip -y && \
apt-get install -y sudo vim && \
apt-get install -y sudo vim python3-pip tzdata tmux && \
apt-get clean -y && \
rm -rf /var/lib/apt/lists/*

Expand All @@ -35,4 +34,4 @@ RUN cd /home/graphscope/gsctl && \
rm -fr gsctl

RUN echo ". /home/graphscope/.graphscope_env" >> ~/.bashrc
RUN python3 -m pip --no-cache install pyyaml --user
RUN python3 -m pip --no-cache install pyyaml ipython --user
2 changes: 1 addition & 1 deletion k8s/dockerfiles/graphscope-store.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ RUN cd /home/graphscope/graphscope \
FROM ubuntu:22.04

RUN apt-get update -y && \
apt-get install -y sudo default-jdk dnsutils && \
apt-get install -y sudo default-jdk dnsutils tzdata && \
apt-get clean -y && \
rm -rf /var/lib/apt/lists/*

Expand Down
2 changes: 1 addition & 1 deletion k8s/dockerfiles/interactive-experimental.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ COPY --from=builder /home/graphscope/GraphScope/interactive_engine/executor/ir/t
COPY --from=builder /home/graphscope/GraphScope/interactive_engine/executor/ir/target/release/start_rpc_server_k8s /opt/graphscope/interactive_engine/executor/ir/target/release/start_rpc_server_k8s

RUN sudo apt-get update -y && \
sudo apt-get install -y default-jdk && \
sudo apt-get install -y default-jdk tzdata && \
sudo apt-get clean -y && \
sudo rm -rf /var/lib/apt/lists/*

Expand Down
2 changes: 1 addition & 1 deletion k8s/dockerfiles/interactive.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ ENV GRAPHSCOPE_HOME=/opt/graphscope
ENV PATH=$PATH:$GRAPHSCOPE_HOME/bin LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$GRAPHSCOPE_HOME/lib

RUN apt-get update -y && \
apt-get install -y sudo default-jdk && \
apt-get install -y sudo default-jdk tzdata && \
apt-get clean -y && \
rm -rf /var/lib/apt/lists/*

Expand Down
3 changes: 1 addition & 2 deletions k8s/dockerfiles/vineyard-dev.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ ENV PATH=$PATH:$GRAPHSCOPE_HOME/bin:$HADOOP_HOME/bin:/home/graphscope/.local/bin
COPY --from=ext /opt/hadoop-3.3.0 /opt/hadoop-3.3.0

RUN apt-get update && \
apt-get install python3-pip -y && \
apt-get install -y sudo default-jre && \
apt-get install -y sudo default-jre python3-pip tzdata && \
apt-get clean -y && \
rm -rf /var/lib/apt/lists/*

Expand Down
20 changes: 11 additions & 9 deletions k8s/dockerfiles/vineyard-runtime.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,17 @@ FROM ubuntu:22.04 AS runtime
ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib:/usr/local/lib64:/opt/graphscope/lib:/opt/graphscope/lib64

RUN apt-get update -y && \
apt-get install --no-install-recommends -y sudo \
libunwind-dev \
libgomp1 \
openmpi-bin \
libgflags-dev \
libgoogle-glog-dev \
libboost-filesystem-dev \
wget \
ca-certificates && \
apt-get install --no-install-recommends -y \
sudo \
libunwind-dev \
libgomp1 \
openmpi-bin \
libgflags-dev \
libgoogle-glog-dev \
libboost-filesystem-dev \
wget \
ca-certificates \
tzdata && \
apt-get clean -y && \
rm -rf /var/lib/apt/lists/*

Expand Down

0 comments on commit 334b842

Please sign in to comment.