This is an automated email from the ASF dual-hosted git repository.
dongjoon pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/orc.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new 1c4091d4b ORC-1695: Upgrade gson to 2.10.1
1c4091d4b is described below
commit 1c4091d4bea68f04b7efd511e377423f99888da8
Author: sychen <syc...@ctrip.com>
AuthorDate: Fri Apr 19 09:01:22 2024 -0700
ORC-1695: Upgrade gson to 2.10.1
### What changes were proposed in this pull request?
This PR aims to upgrade `Gson` to `2.10.1`.
### Why are the changes needed?
Jan 7, 2023
https://github.com/google/gson/releases/tag/gson-parent-2.10.1
Oct 25, 2022
https://github.com/google/gson/releases/tag/gson-parent-2.10
Aug 1, 2022
https://github.com/google/gson/releases/tag/gson-parent-2.9.1
### How was this patch tested?
GA
### Was this patch authored or co-authored using generative AI tooling?
No
Closes #1897 from cxzl25/ORC-1695.
Authored-by: sychen <syc...@ctrip.com>
Signed-off-by: Dongjoon Hyun <dongj...@apache.org>
(cherry picked from commit dc89f18894175aa8fcaa06f6f6b8099967e7dabc)
Signed-off-by: Dongjoon Hyun <dongj...@apache.org>
---
java/pom.xml | 2 +-
java/tools/src/test/resources/orc-file-dump.json | 106 +++++++++++------------
2 files changed, 54 insertions(+), 54 deletions(-)
diff --git a/java/pom.xml b/java/pom.xml
index 4b414869d..be48629ae 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -134,7 +134,7 @@
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
- <version>2.9.0</version>
+ <version>2.10.1</version>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
diff --git a/java/tools/src/test/resources/orc-file-dump.json
b/java/tools/src/test/resources/orc-file-dump.json
index d94c59bb6..ed821943e 100644
--- a/java/tools/src/test/resources/orc-file-dump.json
+++ b/java/tools/src/test/resources/orc-file-dump.json
@@ -2,7 +2,7 @@
"fileName": "TestFileDump.testDump.orc",
"fileVersion": "0.12",
"writerVersion": "ORC_14",
- "softwareVersion": "ORC Java 1.9.0-SNAPSHOT",
+ "softwareVersion": "ORC Java 2.1.0-SNAPSHOT",
"numberOfRows": 21000,
"compression": "ZLIB",
"compressionBufferSize": 4096,
@@ -461,48 +461,48 @@
"numHashFunctions": 7,
"bitCount": 9600,
"popCount": 238,
- "loadFactor": 0.024791667237877846,
- "expectedFpp": 5.756256582500896E-12
+ "loadFactor": 0.024791667,
+ "expectedFpp": 5.7562566E-12
},
{
"entryId": 1,
"numHashFunctions": 7,
"bitCount": 9600,
"popCount": 238,
- "loadFactor": 0.024791667237877846,
- "expectedFpp": 5.756256582500896E-12
+ "loadFactor": 0.024791667,
+ "expectedFpp": 5.7562566E-12
},
{
"entryId": 2,
"numHashFunctions": 7,
"bitCount": 9600,
"popCount": 238,
- "loadFactor": 0.024791667237877846,
- "expectedFpp": 5.756256582500896E-12
+ "loadFactor": 0.024791667,
+ "expectedFpp": 5.7562566E-12
},
{
"entryId": 3,
"numHashFunctions": 7,
"bitCount": 9600,
"popCount": 238,
- "loadFactor": 0.024791667237877846,
- "expectedFpp": 5.756256582500896E-12
+ "loadFactor": 0.024791667,
+ "expectedFpp": 5.7562566E-12
},
{
"entryId": 4,
"numHashFunctions": 7,
"bitCount": 9600,
"popCount": 238,
- "loadFactor": 0.024791667237877846,
- "expectedFpp": 5.756256582500896E-12
+ "loadFactor": 0.024791667,
+ "expectedFpp": 5.7562566E-12
}
],
"stripeLevelBloomFilter": {
"numHashFunctions": 7,
"bitCount": 9600,
"popCount": 238,
- "loadFactor": 0.024791667237877846,
- "expectedFpp": 5.756256582500896E-12
+ "loadFactor": 0.024791667,
+ "expectedFpp": 5.7562566E-12
}
}
]
@@ -704,48 +704,48 @@
"numHashFunctions": 7,
"bitCount": 9600,
"popCount": 238,
- "loadFactor": 0.024791667237877846,
- "expectedFpp": 5.756256582500896E-12
+ "loadFactor": 0.024791667,
+ "expectedFpp": 5.7562566E-12
},
{
"entryId": 1,
"numHashFunctions": 7,
"bitCount": 9600,
"popCount": 238,
- "loadFactor": 0.024791667237877846,
- "expectedFpp": 5.756256582500896E-12
+ "loadFactor": 0.024791667,
+ "expectedFpp": 5.7562566E-12
},
{
"entryId": 2,
"numHashFunctions": 7,
"bitCount": 9600,
"popCount": 238,
- "loadFactor": 0.024791667237877846,
- "expectedFpp": 5.756256582500896E-12
+ "loadFactor": 0.024791667,
+ "expectedFpp": 5.7562566E-12
},
{
"entryId": 3,
"numHashFunctions": 7,
"bitCount": 9600,
"popCount": 238,
- "loadFactor": 0.024791667237877846,
- "expectedFpp": 5.756256582500896E-12
+ "loadFactor": 0.024791667,
+ "expectedFpp": 5.7562566E-12
},
{
"entryId": 4,
"numHashFunctions": 7,
"bitCount": 9600,
"popCount": 238,
- "loadFactor": 0.024791667237877846,
- "expectedFpp": 5.756256582500896E-12
+ "loadFactor": 0.024791667,
+ "expectedFpp": 5.7562566E-12
}
],
"stripeLevelBloomFilter": {
"numHashFunctions": 7,
"bitCount": 9600,
"popCount": 238,
- "loadFactor": 0.024791667237877846,
- "expectedFpp": 5.756256582500896E-12
+ "loadFactor": 0.024791667,
+ "expectedFpp": 5.7562566E-12
}
}
]
@@ -947,48 +947,48 @@
"numHashFunctions": 7,
"bitCount": 9600,
"popCount": 238,
- "loadFactor": 0.024791667237877846,
- "expectedFpp": 5.756256582500896E-12
+ "loadFactor": 0.024791667,
+ "expectedFpp": 5.7562566E-12
},
{
"entryId": 1,
"numHashFunctions": 7,
"bitCount": 9600,
"popCount": 238,
- "loadFactor": 0.024791667237877846,
- "expectedFpp": 5.756256582500896E-12
+ "loadFactor": 0.024791667,
+ "expectedFpp": 5.7562566E-12
},
{
"entryId": 2,
"numHashFunctions": 7,
"bitCount": 9600,
"popCount": 238,
- "loadFactor": 0.024791667237877846,
- "expectedFpp": 5.756256582500896E-12
+ "loadFactor": 0.024791667,
+ "expectedFpp": 5.7562566E-12
},
{
"entryId": 3,
"numHashFunctions": 7,
"bitCount": 9600,
"popCount": 238,
- "loadFactor": 0.024791667237877846,
- "expectedFpp": 5.756256582500896E-12
+ "loadFactor": 0.024791667,
+ "expectedFpp": 5.7562566E-12
},
{
"entryId": 4,
"numHashFunctions": 7,
"bitCount": 9600,
"popCount": 238,
- "loadFactor": 0.024791667237877846,
- "expectedFpp": 5.756256582500896E-12
+ "loadFactor": 0.024791667,
+ "expectedFpp": 5.7562566E-12
}
],
"stripeLevelBloomFilter": {
"numHashFunctions": 7,
"bitCount": 9600,
"popCount": 238,
- "loadFactor": 0.024791667237877846,
- "expectedFpp": 5.756256582500896E-12
+ "loadFactor": 0.024791667,
+ "expectedFpp": 5.7562566E-12
}
}
]
@@ -1190,48 +1190,48 @@
"numHashFunctions": 7,
"bitCount": 9600,
"popCount": 238,
- "loadFactor": 0.024791667237877846,
- "expectedFpp": 5.756256582500896E-12
+ "loadFactor": 0.024791667,
+ "expectedFpp": 5.7562566E-12
},
{
"entryId": 1,
"numHashFunctions": 7,
"bitCount": 9600,
"popCount": 238,
- "loadFactor": 0.024791667237877846,
- "expectedFpp": 5.756256582500896E-12
+ "loadFactor": 0.024791667,
+ "expectedFpp": 5.7562566E-12
},
{
"entryId": 2,
"numHashFunctions": 7,
"bitCount": 9600,
"popCount": 238,
- "loadFactor": 0.024791667237877846,
- "expectedFpp": 5.756256582500896E-12
+ "loadFactor": 0.024791667,
+ "expectedFpp": 5.7562566E-12
},
{
"entryId": 3,
"numHashFunctions": 7,
"bitCount": 9600,
"popCount": 238,
- "loadFactor": 0.024791667237877846,
- "expectedFpp": 5.756256582500896E-12
+ "loadFactor": 0.024791667,
+ "expectedFpp": 5.7562566E-12
},
{
"entryId": 4,
"numHashFunctions": 7,
"bitCount": 9600,
"popCount": 238,
- "loadFactor": 0.024791667237877846,
- "expectedFpp": 5.756256582500896E-12
+ "loadFactor": 0.024791667,
+ "expectedFpp": 5.7562566E-12
}
],
"stripeLevelBloomFilter": {
"numHashFunctions": 7,
"bitCount": 9600,
"popCount": 238,
- "loadFactor": 0.024791667237877846,
- "expectedFpp": 5.756256582500896E-12
+ "loadFactor": 0.024791667,
+ "expectedFpp": 5.7562566E-12
}
}
]
@@ -1361,16 +1361,16 @@
"numHashFunctions": 7,
"bitCount": 9600,
"popCount": 238,
- "loadFactor": 0.024791667237877846,
- "expectedFpp": 5.756256582500896E-12
+ "loadFactor": 0.024791667,
+ "expectedFpp": 5.7562566E-12
}
],
"stripeLevelBloomFilter": {
"numHashFunctions": 7,
"bitCount": 9600,
"popCount": 238,
- "loadFactor": 0.024791667237877846,
- "expectedFpp": 5.756256582500896E-12
+ "loadFactor": 0.024791667,
+ "expectedFpp": 5.7562566E-12
}
}
]
