DX-61034: Arrow changes from apacheGH-34865 PR

stevelorddremio · Jan 18, 2024 · 0799cda · 0799cda
1 parent 788bb30
commit 0799cda
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 11 deletions.
diff --git a/cpp/src/arrow/flight/types.h b/cpp/src/arrow/flight/types.h
@@ -601,8 +601,6 @@ class ARROW_FLIGHT_EXPORT FlightInfo {
   mutable bool reconstructed_schema_;
 };
 
-<<<<<<< HEAD
-=======
 /// \brief The information to process a long-running query.
 class ARROW_FLIGHT_EXPORT PollInfo {
  public:
@@ -884,14 +882,6 @@ struct ARROW_FLIGHT_EXPORT CloseSessionResult {
   static arrow::Result<CloseSessionResult> Deserialize(std::string_view serialized);
 };
 
-<<<<<<< HEAD
-
-
-
-
->>>>>>> 5df37ac44 (WIP: High-level design review ONLY)
-=======
->>>>>>> d8dba8435 (Add new SetSessionOption statuses to Proto)
 /// \brief An iterator to FlightInfo instances returned by ListFlights.
 class ARROW_FLIGHT_EXPORT FlightListing {
  public:

diff --git a/java/vector/src/main/java/org/apache/arrow/vector/dictionary/DictionaryEncoder.java b/java/vector/src/main/java/org/apache/arrow/vector/dictionary/DictionaryEncoder.java
@@ -112,7 +112,7 @@ public static ValueVector decode(ValueVector indices, Dictionary dictionary, Buf
    * @param valueCount dictionary vector valueCount.
    * @return index type.
    */
-  public static ArrowType.Int getIndexType(int valueCount) {
+  public static ArrowType.Int getIndexType(long valueCount) {
     Preconditions.checkArgument(valueCount >= 0);
     if (valueCount <= Byte.MAX_VALUE) {
       return new ArrowType.Int(8, true);