Skip to content
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.

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

DM-48132: Introduce Binary2 VOTable Serialization and make it default #120

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ war {
configurations {
intTestCompile.extendsFrom testImplementation
intTestRuntime.extendsFrom testRuntimeOnly
implementation.exclude group: 'uk.ac.starlink'
//implementation.exclude group: 'uk.ac.starlink'
}

dependencies {
Expand All @@ -56,6 +56,10 @@ dependencies {
implementation 'org.opencadc:cadc-uws:1.0.5'
implementation 'org.opencadc:cadc-uws-server:1.2.21'
implementation 'org.opencadc:cadc-vosi:1.4.6'
implementation 'uk.ac.starlink:stil:[4.0,5.0)'

implementation 'uk.ac.starlink:jcdf:[1.2.3,2.0)'
implementation 'uk.ac.starlink:stil:[4.0,5.0)'

// Switch out this to use any supported database instead of PostgreSQL.
// ## START CUSTOM DATABASE ##
Expand Down
13 changes: 13 additions & 0 deletions changelog.d/20250114_162646_steliosvoutsinas_DM_48132.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<!-- Delete the sections that don't apply -->

### Added

- ResultSetWriter class, used to write out Binary2 VOTable serialization

### Changed

- Added new Binary2 VOTable serialization, make default. Retain tabledata as an optional format

### Fixed

- Correctly print field metadata
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ public MaxRecValidatorImpl() {

@Override
public Integer validate() {
LOGGER.info("");
if (super.sync) {
try {
// no limits on sync
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/opencadc/tap/impl/QServQueryRunner.java
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@ private void doIt()
// and restrict to forward only so that client memory usage is minimal since
// we are only interested in reading the ResultSet once

connection.setAutoCommit(false);
connection.setAutoCommit(false);
pstmt = connection.prepareStatement(sql);
pstmt.setFetchSize(1000);
pstmt.setFetchDirection(ResultSet.FETCH_FORWARD);
Expand All @@ -397,7 +397,7 @@ private void doIt()
tableWriter.write(resultSet, syncOutput.getOutputStream());
else
tableWriter.write(resultSet, syncOutput.getOutputStream(), maxRows.longValue());

t2 = System.currentTimeMillis(); dt = t2 - t1; t1 = t2;
diagnostics.add(new Result("diag", URI.create("query:stream:"+dt)));
}
Expand Down
Loading
Loading