Update

apache · Aug 29, 2023 · 0c6f5bd · 0c6f5bd
1 parent 16e78c0
commit 0c6f5bd
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 17 deletions.
diff --git a/cpp/include/gar/util/expression.h b/cpp/include/gar/util/expression.h
@@ -16,20 +16,15 @@ limitations under the License.
 #include <memory>
 #include <string>
 
+#include "arrow/compute/api.h"
+
 #include "gar/graph_info.h"
 
 #ifndef GAR_UTIL_EXPRESSION_H_
 #define GAR_UTIL_EXPRESSION_H_
 
 namespace GAR_NAMESPACE_INTERNAL {
 
-// forward declarations
-namespace arrow {
-namespace compute {
-class Expression;
-}
-}  // namespace arrow
-
 using ArrowExpression = arrow::compute::Expression;
 
 /**
@@ -90,7 +85,7 @@ class ExpressionLiteral : public Expression {
   ExpressionLiteral(const ExpressionLiteral& other) = default;
   ~ExpressionLiteral() = default;
 
-  Result<ArrowExpression> Evaluate();
+  Result<ArrowExpression> Evaluate() { return arrow::compute::literal(value_); }
 
  private:
   T value_;

diff --git a/cpp/include/gar/util/reader_util.h b/cpp/include/gar/util/reader_util.h
@@ -22,10 +22,11 @@ limitations under the License.
 #include <vector>
 
 #include "gar/graph_info.h"
-#include "gar/util/expression.h"
 
 namespace GAR_NAMESPACE_INTERNAL {
 
+class Expression;
+
 namespace util {
 
 using Filter = std::shared_ptr<Expression>;

diff --git a/cpp/src/expression.cc b/cpp/src/expression.cc
@@ -12,18 +12,10 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-
-#include "arrow/compute/api.h"
-
 #include "gar/util/expression.h"
 
 namespace GAR_NAMESPACE_INTERNAL {
 
-template <typename T, typename enabler>
-ExpressionLiteral<T, Enabler>::Evaluate() {
-  return arrow::compute::literal(value_);
-}
-
 Result<ArrowExpression> ExpressionProperty::Evaluate() {
   return arrow::compute::field_ref(property_.name);
 }

diff --git a/cpp/src/reader_util.cc b/cpp/src/reader_util.cc
@@ -21,6 +21,7 @@ limitations under the License.
 #include "parquet/arrow/reader.h"
 
 #include "gar/graph_info.h"
+#include "gar/util/expression.h"
 #include "gar/util/filesystem.h"
 #include "gar/util/reader_util.h"