Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 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
2 changes: 1 addition & 1 deletion packages/bolt-connection/src/bolt/bolt-protocol-v1.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import {
assertTxConfigIsEmpty,
assertImpersonatedUserIsEmpty
} from './bolt-protocol-util'
import { Chunker } from '../chunking'
import { Chunker } from '../channel/chunking'
import { v1 } from '../packstream'
import RequestMessage from './request-message'
import {
Expand Down
6 changes: 3 additions & 3 deletions packages/bolt-connection/src/bolt/bolt-protocol-v4x0.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* limitations under the License.
*/
import BoltProtocolV3 from './bolt-protocol-v3'
import RequestMessage, { ALL } from './request-message'
import RequestMessage from './request-message'
import { assertImpersonatedUserIsEmpty } from './bolt-protocol-util'
import {
ResultStreamObserver,
Expand All @@ -28,7 +28,7 @@ import { internal } from 'neo4j-driver-core'

const {
bookmark: { Bookmark },
constants: { BOLT_PROTOCOL_V4_0 },
constants: { BOLT_PROTOCOL_V4_0, FETCH_ALL },
txConfig: { TxConfig }
} = internal

Expand Down Expand Up @@ -90,7 +90,7 @@ export default class BoltProtocol extends BoltProtocolV3 {
afterComplete,
flush = true,
reactive = false,
fetchSize = ALL
fetchSize = FETCH_ALL
} = {}
) {
const observer = new ResultStreamObserver({
Expand Down
2 changes: 1 addition & 1 deletion packages/bolt-connection/src/bolt/bolt-protocol-v4x1.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* limitations under the License.
*/
import BoltProtocolV4 from './bolt-protocol-v4x0'
import RequestMessage, { ALL } from './request-message'
import RequestMessage from './request-message'
import { LoginObserver } from './stream-observers'
import { internal } from 'neo4j-driver-core'

Expand Down
6 changes: 3 additions & 3 deletions packages/bolt-connection/src/bolt/bolt-protocol-v4x4.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
import BoltProtocolV43 from './bolt-protocol-v4x3'

import { internal } from 'neo4j-driver-core'
import RequestMessage, { ALL } from './request-message'
import RequestMessage from './request-message'
import { RouteObserver, ResultStreamObserver } from './stream-observers'

const {
constants: { BOLT_PROTOCOL_V4_4 },
constants: { BOLT_PROTOCOL_V4_4, FETCH_ALL },
bookmark: { Bookmark },
} = internal

Expand Down Expand Up @@ -84,7 +84,7 @@ export default class BoltProtocol extends BoltProtocolV43 {
afterComplete,
flush = true,
reactive = false,
fetchSize = ALL
fetchSize = FETCH_ALL
} = {}
) {
const observer = new ResultStreamObserver({
Expand Down
10 changes: 6 additions & 4 deletions packages/bolt-connection/src/bolt/stream-observers.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import { newError, error, Integer, Record, json } from 'neo4j-driver-core'
import { ALL } from './request-message'
import { newError, error, Integer, Record, json, internal } from 'neo4j-driver-core'
import RawRoutingTable from './routing-table-raw'

const {
constants: { FETCH_ALL },
} = internal
const { PROTOCOL_ERROR } = error
class StreamObserver {
onNext (rawRecord) {}
Expand Down Expand Up @@ -59,7 +61,7 @@ class ResultStreamObserver extends StreamObserver {
reactive = false,
moreFunction,
discardFunction,
fetchSize = ALL,
fetchSize = FETCH_ALL,
beforeError,
afterError,
beforeKeys,
Expand Down Expand Up @@ -367,7 +369,7 @@ class ResultStreamObserver extends StreamObserver {

_setupAuoPull (fetchSize) {
this._autoPull = true
if (fetchSize === ALL) {
if (fetchSize === FETCH_ALL) {
this._lowRecordWatermark = Number.MAX_VALUE // we shall always lower than this number to enable auto pull
this._highRecordWatermark = Number.MAX_VALUE // we shall never reach this number to disable auto pull
} else {
Expand Down
2 changes: 1 addition & 1 deletion packages/bolt-connection/src/connection/connection.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* limitations under the License.
*/

import { ResultStreamObserver, BoltProtocol } from '..bolt'
import { ResultStreamObserver, BoltProtocol } from '../bolt'

export default class Connection {
/**
Expand Down
2 changes: 1 addition & 1 deletion packages/bolt-connection/src/rediscovery/rediscovery.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/
import RoutingTable from './routing-table'
import { RawRoutingTable } from '../bolt'
import { newError, error, Session, ServerAddress } from 'neo4j-driver-core'
import { newError, error, Session } from 'neo4j-driver-core'

const { SERVICE_UNAVAILABLE } = error
const PROCEDURE_NOT_FOUND_CODE = 'Neo.ClientError.Procedure.ProcedureNotFound'
Expand Down
1 change: 0 additions & 1 deletion packages/core/src/internal/observers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
* limitations under the License.
*/

import { observer } from '.'
import Record from '../record'
import ResultSummary from '../result-summary'

Expand Down